py2/py3: change fromlist for __import__() in Python 3.

product/ERP5Type/patches/DA.py

@@ -31,6 +31,7 @@ from zLOG import LOG, INFO, ERROR
 from io import BytesIO
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Utils import str2bytes
+import six
 
 security = ClassSecurityInfo()
 DA.security = security
@@ -282,7 +283,7 @@ def getObjectMeta(original_function):
     # imported, which is enough to use a ZODB Extension as a brain.
     try:
       m = __import__('erp5.component.extension.%s' % module, globals(),
-                     {}, 'erp5.component.extension')
+                     {}, ['erp5.component.extension'] if six.PY2 else ['erp5'])
 
       o = getattr(m, name, None)
       if o is None:

product/ERP5Type/tests/runUnitTest.py

@@ -300,7 +300,7 @@ class ERP5TypeTestLoader(unittest.TestLoader):
   def _importZodbTestComponent(self, name):
     import erp5.component.test
     module = __import__('erp5.component.test.' + name,
-                        fromlist=['erp5.component.test'],
+                        fromlist=['erp5.component.test'] if six.PY2 else ['erp5'],
                         level=0)
     try:
       self._test_component_ref_list.append(module)