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

product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py

@@ -53,10 +53,7 @@ def hashPdataObject(pdata_object):
   while pdata_object is not None:
     chunk = pdata_object.aq_base
     md5_hash.update(chunk.data)
-    if six.PY2:
-      pdata_object = chunk.next
-    else:
-      pdata_object = chunk.__next__
+    pdata_object = chunk.next
     chunk._p_deactivate()
   return md5_hash.hexdigest()
 

product/ERP5Type/tests/utils.py

@@ -80,7 +80,7 @@ class FileUpload(FileIO):
     if name is None:
       name = os.path.basename(path)
     self.filename = name
-    file.__init__(self, path)
+    FileIO.__init__(self, path)
     self.headers = {}
 
 # dummy objects