And workaround safeimage impacted by this round2 patch.

Co-authored-by: Arnaud Fontaine <arnaud.fontaine@nexedi.com>

Followup of 94739085.

key()-based sorting is now used instead, available since Python 2.4.

Jupyter integration is more or less abandoned. Just do the minimum to make tests pass.

Also, remove `if True/1/False/0` statement raising pylint warnings.
Co-authored-by: Arnaud Fontaine <arnaud.fontaine@nexedi.com>

* Zope API changes:
  + publish():
    - stdin is now BytesIO rather than StringIO.
    - Returned value of a script is passed to str() in python2, not in python3 anymore.
  + HTTPResponse `body` property is now bytes().
  + OFS.Image.File file parameter is bytes().
  + zope.interface implements() is now @implementer decorator.
  + Python standard logging module recommended instead of zLOG.
* Python3 API changes:
  + builtin reduce() was removed.
  + urlnorm is now available.
  + Use BytesIO rather than StringIO to follow py3 API.
  + hmac.new() requires digestmod argument from Python 3.8.
  + Use six.moves library to handle moved objects from py2 to py3.
  + `modernize -f xrange_six` then slightly adjusted manually to just use range
     where it does not make a significant difference (for example in test).
  + base64.b64encode() now expects bytes().
  + UserDict() interface changed:
    - New parameter in update() and pop().
    - `failobj` setdefault parameter renamed to `default`.
  + ensure_list() on dict.{values,items}() and list(dict) for dict.keys() when
    we really need a list and not an iterable (Python3).
    - Add ensure_list() to RestrictedPython safe_builtins as it's very common usage.
  + Make dict iteration works on both version of Python.
    - Use six.iter{items,values,keys}().
    - has_key() has been removed.
    - Make sure that dict.{items,values,keys}() returns a real list when
    modified (ensure_list()).
  + Comparisons between int and NoneType raises TypeError.
  + No more unbound methods in python3 so use six.get_unbound_function().
  + Exceptions:
    - No longer behave as sequences. Using `args` attribute instead.
    - When an exception has been assigned using `as target`, it is cleared at
      the end of the except clause.
  + file: py2 was returning `str` upon reading, now it returns text strings.
    Also, opening mode is text strings by default.
  + Data strings are bytes().
    - Replace str() by bytes().
  + iterators no longer have next() method, instead there is next() builtin.
  + New ConnectionError exception so rename existing one to not clash.
  + Integer division is now with //.
  + __nonzero__ is now __bool__.
  + apply() does not exist anymore.
  + Deprecated threading.Thread isAlive() has been removed.
  + im_func replaced by __func__.
  + Use six.with_metaclass() to define metaclass in a cross-compatible way with py2 and py3.
  + Only test method can be marked as expectedFailure(), not assert statement anymore.
  + os.path.walk() removed.
Co-Authored-by: Kazuhiko SHIOZAKI <kazuhiko@nexedi.com>
  Arnaud Fontaine <arnaud.fontaine@nexedi.com>
  Carlos Ramos Carreño <carlos.ramos@nexedi.com>
  Emmeline Vouriot <emmeline.vouriot@nexedi.com>

some conversion (TextDocument) depend on the content type, so it's
necessary to first update the content type before trying to convert to
base format

Use scrubHTML() from safe_html module instead.

It was using bytes(), but this seems wrong now.

a17bb910: py2/py3: Make Products code compatible with both python2 and python3.

erp5_syncml: invoke callback method by activity in non split_indexation case as well to make transaction shorter.

Use the removeProperty method.

This executes even if setup() encounters an error and the cleanup hook is added
when opening the file, not later on.

Also, unify makeFileUpload() and makeFilePath() to remove duplicated code.
Co-authored-by: Arnaud Fontaine <arnaud.fontaine@nexedi.com>

See merge request !1979

- {'destination_list': ['person_module/he', 'person_module/me'],
+ {'destination_list': ['person_module/me', 'person_module/he'],

See merge request !1963