py3: Products.ERP5Type.dynamic.

product/ERP5Type/dynamic/accessor_holder.py

@@ -98,7 +98,7 @@ class AccessorHolderModuleType(ModuleType):
     """
     Clear the content of the module
     """
-    for klass in self.__dict__.values():
+    for klass in ensure_list(self.__dict__.values()):
       if isinstance(klass, AccessorHolderType):
         # Delete these attributes (computed on the portal type class
         # from its accessor holder) before deleting the class itself
@@ -336,7 +336,7 @@ def applyCategoryAsRelatedValueAccessor(accessor_holder,
   accessor = RelatedValue.IdListGetter(accessor_name + 'RelatedIds', category_id)
   accessor_holder.registerAccessor(accessor, read_permission)
 
-  for accessor_class, accessor_name_list in related_accessor_definition_dict.items():
+  for accessor_class, accessor_name_list in related_accessor_definition_dict.iteritems():
     for accessor_name in accessor_name_list:
       accessor = accessor_class(accessor_name % uppercase_category_id, category_id)
       accessor_holder.registerAccessor(accessor, read_permission)

product/ERP5Type/dynamic/component_package.py

@@ -30,11 +30,13 @@
 # There is absolutely no reason to use relative imports when loading a Component
 from __future__ import absolute_import
 
+import six
 import sys
 import imp
 import collections
 from six import reraise
 
+from Products.ERP5Type.Utils import ensure_list
 from Products.ERP5.ERP5Site import getSite
 from Products.ERP5Type import product_path as ERP5Type_product_path
 from . import aq_method_lock
@@ -51,6 +53,12 @@ class ComponentVersionPackage(ModuleType):
   """
   __path__ = []
 
+try:
+  ModuleNotFoundError
+except NameError: # < 3.6
+  class ModuleNotFoundError(ImportError):
+    pass
+
 class ComponentDynamicPackage(ModuleType):
   """
   A top-level component is a package as it contains modules, this is required
@@ -420,8 +428,10 @@ class ComponentDynamicPackage(ModuleType):
       # load_module(), and returning module 'name' in contrary to __import__
       # returning 'erp5' (requiring fromlist parameter which is slower)
       return import_module(fullname)
+    except ModuleNotFoundError:
+      pass
     except ImportError as e:
-      if str(e) != "No module named " + name:
+      if six.PY3 or str(e) != "No module named " + name:
         LOG("ERP5Type.dynamic", WARNING,
             "Could not load Component module %r" % fullname, error=True)
 
@@ -443,10 +453,10 @@ class ComponentDynamicPackage(ModuleType):
       # Force reload of ModuleSecurityInfo() as it may have been changed in
       # the source code
       for modsec_dict in _moduleSecurity, _appliedModuleSecurity:
-        for k in modsec_dict.keys():
+        for k in ensure_list(modsec_dict.keys()):
           if k.startswith(self._namespace):
             del modsec_dict[k]
-      for k, v in MNAME_MAP.items():
+      for k, v in ensure_list(MNAME_MAP.items()):
         if v.startswith(self._namespace):
           del MNAME_MAP[k]
 
@@ -454,7 +464,7 @@ class ComponentDynamicPackage(ModuleType):
           if k.startswith('Products.'):
             del sys.modules[k]
 
-    for name, module in package.__dict__.items():
+    for name, module in ensure_list(package.__dict__.items()):
       if name[0] == '_' or not isinstance(module, ModuleType):
         continue
 

product/ERP5Type/dynamic/dynamic_module.py

@@ -28,6 +28,7 @@ from __future__ import absolute_import
 #
 ##############################################################################
 
+from Products.ERP5Type.Utils import ensure_list
 from types import ModuleType
 from . import aq_method_lock
 import sys
@@ -81,7 +82,7 @@ class RefManager(dict):
     Remove cache items with no Request Left.
     """
     for (current_last_sync,
-         (request_obj_weakset, _)) in self.items():
+         (request_obj_weakset, _)) in ensure_list(self.items()):
       if not request_obj_weakset:
         del self[current_last_sync]
 

product/ERP5Type/dynamic/lazy_class.py

@@ -243,7 +243,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder):
        erp5.portal_type.XXX, GhostBaseMetaClass instance, *TAIL
     """
     if not cls.__isghost__:
-      for attr in cls.__dict__.keys():
+      for attr in ensure_list(cls.__dict__.keys()):
         if attr not in ('__module__',
                         '__doc__',
                         '__setstate__',
@@ -316,7 +316,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder):
     result = PropertyHolder._getPropertyHolderItemList(cls)
     for parent in cls.mro():
       if parent.__module__.startswith('erp5.accessor_holder'):
-        for x in parent.__dict__.items():
+        for x in parent.__dict__.iteritems():
           if x[0] not in PropertyHolder.RESERVED_PROPERTY_SET:
             result.append(x)
     return result

product/ERP5Type/dynamic/portal_type_class.py

@@ -27,6 +27,7 @@
 #
 ##############################################################################
 
+import six
 import os
 import inspect
 import transaction
@@ -36,7 +37,7 @@ from Products.ERP5Type.mixin.temporary import TemporaryDocumentMixin
 from Products.ERP5Type.Base import resetRegisteredWorkflowMethod
 from . import aq_method_lock
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5Type.Utils import setDefaultClassProperties
+from Products.ERP5Type.Utils import setDefaultClassProperties, ensure_list
 from Products.ERP5Type import document_class_registry, mixin_class_registry
 from Products.ERP5Type.dynamic.accessor_holder import createAllAccessorHolderList
 from Products.ERP5Type.Accessor.Constant import Getter as ConstantGetter
@@ -60,6 +61,8 @@ ACQUIRE_LOCAL_ROLE_GETTER_DICT = {
   for acquire_local_role in (False, True)
 }
 
+if six.PY3:
+  StandardError = Exception
 def _importFilesystemClass(classpath):
   try:
     module_path, class_name = classpath.rsplit('.', 1)
@@ -540,7 +543,7 @@ def synchronizeDynamicModules(context, force=False):
       erp5.accessor_holder.clear()
       erp5.accessor_holder.property_sheet.clear()
 
-      for name in erp5.accessor_holder.portal_type.__dict__.keys():
+      for name in ensure_list(erp5.accessor_holder.portal_type.__dict__.keys()):
         if name[0] != '_':
           delattr(erp5.accessor_holder.portal_type, name)