Commit e3365241 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

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

parent 63bb5033
...@@ -27,6 +27,7 @@ from zLOG import LOG, INFO, ERROR ...@@ -27,6 +27,7 @@ from zLOG import LOG, INFO, ERROR
from io import BytesIO from io import BytesIO
from Products.ERP5Type import Permissions from Products.ERP5Type import Permissions
from Products.ERP5Type.Utils import str2bytes from Products.ERP5Type.Utils import str2bytes
import six
security = ClassSecurityInfo() security = ClassSecurityInfo()
DA.security = security DA.security = security
...@@ -278,7 +279,7 @@ def getObjectMeta(original_function): ...@@ -278,7 +279,7 @@ def getObjectMeta(original_function):
# imported, which is enough to use a ZODB Extension as a brain. # imported, which is enough to use a ZODB Extension as a brain.
try: try:
m = __import__('erp5.component.extension.%s' % module, globals(), m = __import__('erp5.component.extension.%s' % module, globals(),
{}, 'erp5.component.extension') {}, ['erp5.component.extension'] if six.PY2 else ['erp5'])
o = getattr(m, name, None) o = getattr(m, name, None)
if o is None: if o is None:
......
...@@ -305,7 +305,7 @@ class ERP5TypeTestLoader(unittest.TestLoader): ...@@ -305,7 +305,7 @@ class ERP5TypeTestLoader(unittest.TestLoader):
def _importZodbTestComponent(self, name): def _importZodbTestComponent(self, name):
import erp5.component.test import erp5.component.test
module = __import__('erp5.component.test.' + name, module = __import__('erp5.component.test.' + name,
fromlist=['erp5.component.test'], fromlist=['erp5.component.test'] if six.PY2 else ['erp5'],
level=0) level=0)
try: try:
self._test_component_ref_list.append(module) self._test_component_ref_list.append(module)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment