WIP: Python 2 to 3 fixes

product/ERP5Form/ImageField.py

@@ -145,7 +145,6 @@ class ImageFieldWidget(Widget.TextWidget):
       if value in ('', None):
         return None
       path = '/'.join(REQUEST.physicalPathFromURL(value))
-      path = path.encode()
       image_object = field.getPortalObject().restrictedTraverse(path)
       display = field.get_value('image_display')
       format = field.get_value('image_format')

product/ERP5OOo/FormPrintout.py

@@ -1107,7 +1107,7 @@ class ODGStrategy(ODFStrategy):
       text_xpath = '//draw:frame[@draw:name="%s"]' % field.id
       node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap)
       value = field.get_value('default')
-      if isinstance(value, str):
+      if isinstance(value, bytes):
         value = value.decode('utf-8')
       for target_node in node_list:
         # render the field in odg xml node format

product/ERP5OOo/OOoUtils.py

@@ -82,10 +82,7 @@ class OOoBuilder(Implicit):
         dat = document.data
         while dat is not None:
           self._document.write(dat.data)
-          if six.PY2:
-            dat = dat.next
-          else:
-            dat = dat.__next__
+          dat = dat.next
       else:
         # Default behaviour
         self._document.write(document.data)