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
137
Merge Requests
137
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
e9c618bf
Commit
e9c618bf
authored
2 years ago
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py3: Some ZopePatch are python2-only so disable them.
parent
cb7601e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
9 deletions
+19
-9
product/ERP5Type/ZopePatch.py
product/ERP5Type/ZopePatch.py
+12
-7
product/ERP5Type/__init__.py
product/ERP5Type/__init__.py
+4
-1
product/Localizer/__init__.py
product/Localizer/__init__.py
+3
-1
No files found.
product/ERP5Type/ZopePatch.py
View file @
e9c618bf
...
...
@@ -58,7 +58,6 @@ if six.PY2:
from
Products.ERP5Type.patches
import
PropertySheets
from
Products.ERP5Type.patches
import
CMFCoreSkinnable
from
Products.ERP5Type.patches
import
CMFCoreSkinsTool
from
Products.ERP5Type.patches
import
OFSFile
from
Products.ERP5Type.patches
import
OFSFolder
from
Products.ERP5Type.patches
import
OFSUninstalled
from
Products.ERP5Type.patches
import
PersistentMapping
...
...
@@ -74,10 +73,13 @@ if WITH_LEGACY_WORKFLOW:
from
Products.ERP5Type.patches
import
transforms
from
Products.ERP5Type.patches
import
OFSPdata
from
Products.ERP5Type.patches
import
make_hidden_input
from
Products.ERP5Type.patches
import
DemoStorage
if
six
.
PY2
:
# Check with other work on ZODB
from
Products.ERP5Type.patches
import
DemoStorage
from
Products.ERP5Type.patches
import
unicodeconflictresolver
from
Products.ERP5Type.patches
import
ZODBConnection
from
Products.ERP5Type.patches
import
ZopePageTemplateUtils
if
six
.
PY2
:
from
Products.ERP5Type.patches
import
ZopePageTemplateUtils
from
Products.ERP5Type.patches
import
OFSHistory
from
Products.ERP5Type.patches
import
OFSItem
from
Products.ERP5Type.patches
import
ExternalMethod
...
...
@@ -93,13 +95,14 @@ from Products.ERP5Type.patches import SourceCodeEditorZMI
from
Products.ERP5Type.patches
import
CachingPolicyManager
from
Products.ERP5Type.patches
import
AcceleratedHTTPCacheManager
from
Products.ERP5Type.patches
import
ExceptionFormatter
from
Products.ERP5Type.patches
import
DTMLMethod
from
Products.ERP5Type.patches
import
DTMLDocument
if
six
.
PY2
:
# Not needed with Zope4 and new ZMI
from
Products.ERP5Type.patches
import
DTMLMethod
from
Products.ERP5Type.patches
import
DTMLDocument
# No ZServer, so no webdav
from
Products.ERP5Type.patches
import
WebDAV
from
Products.ERP5Type.patches
import
CMFCoreUtils
from
Products.ERP5Type.patches
import
ZopePageTemplat
e
from
Products.ERP5Type.patches
import
OFSFil
e
from
Products.ERP5Type.patches
import
ZSQLMethod
from
Products.ERP5Type.patches
import
MimetypesRegistry
from
Products.ERP5Type.patches
import
users
...
...
@@ -107,7 +110,9 @@ if six.PY2:
# No ZServer
from
Products.ERP5Type.patches
import
Publish
from
Products.ERP5Type.patches
import
WSGITask
from
Products.ERP5Type.patches
import
urllib_opener
if
six
.
PY2
:
# XXX-zope4py3: urllib2 removed (see future/backports/urllib/request.py)
from
Products.ERP5Type.patches
import
urllib_opener
# These symbols are required for backward compatibility
from
Products.ERP5Type.patches.PropertyManager
import
ERP5PropertyManager
...
...
This diff is collapsed.
Click to expand it.
product/ERP5Type/__init__.py
View file @
e9c618bf
...
...
@@ -32,7 +32,10 @@
"""
from
__future__
import
absolute_import
from
App.config
import
getConfiguration
from
.patches
import
python
,
pylint
,
globalrequest
from
.patches
import
python
,
globalrequest
import
six
if
six
.
PY2
:
from
.patches
import
pylint
from
zLOG
import
LOG
,
INFO
DISPLAY_BOOT_PROCESS
=
False
...
...
This diff is collapsed.
Click to expand it.
product/Localizer/__init__.py
View file @
e9c618bf
...
...
@@ -23,7 +23,9 @@ from App.ImageFile import ImageFile
from
DocumentTemplate.DT_String
import
String
# Import from Localizer
from
.patches
import
get_request
import
six
if
six
.
PY2
:
from
.patches
import
get_request
from
.
import
Localizer
,
MessageCatalog
from
.LocalFiles
import
LocalDTMLFile
...
...
This diff is collapsed.
Click to expand it.
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