Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
a31c9014
Commit
a31c9014
authored
Oct 14, 2022
by
Kazuhiko Shiozaki
Committed by
Arnaud Fontaine
Mar 10, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: change fromlist for __import__() in Python 3.
parent
abe53192
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
product/ERP5Type/patches/DA.py
product/ERP5Type/patches/DA.py
+2
-1
product/ERP5Type/tests/runUnitTest.py
product/ERP5Type/tests/runUnitTest.py
+1
-1
No files found.
product/ERP5Type/patches/DA.py
View file @
a31c9014
...
@@ -31,6 +31,7 @@ from zLOG import LOG, INFO, ERROR
...
@@ -31,6 +31,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
...
@@ -282,7 +283,7 @@ def getObjectMeta(original_function):
...
@@ -282,7 +283,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
:
...
...
product/ERP5Type/tests/runUnitTest.py
View file @
a31c9014
...
@@ -300,7 +300,7 @@ class ERP5TypeTestLoader(unittest.TestLoader):
...
@@ -300,7 +300,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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment