Commit 90ac1881 authored by Arnaud Fontaine's avatar Arnaud Fontaine

py3: Disable Python2-only ZopePatch.

And also disable pylint patch as pylint version with Python3 support is not
supported yet by ERP5...
parent fab0ad27
...@@ -53,9 +53,7 @@ from Products.ERP5Type.patches import ActionInformation ...@@ -53,9 +53,7 @@ from Products.ERP5Type.patches import ActionInformation
from Products.ERP5Type.patches import ActionProviderBase from Products.ERP5Type.patches import ActionProviderBase
from Products.ERP5Type.patches import ActionsTool from Products.ERP5Type.patches import ActionsTool
from Products.ERP5Type.patches import CookieCrumbler from Products.ERP5Type.patches import CookieCrumbler
if six.PY2: from Products.ERP5Type.patches import PropertySheets
# XXX- patch for webdav
from Products.ERP5Type.patches import PropertySheets
from Products.ERP5Type.patches import CMFCoreSkinnable from Products.ERP5Type.patches import CMFCoreSkinnable
from Products.ERP5Type.patches import CMFCoreSkinsTool from Products.ERP5Type.patches import CMFCoreSkinsTool
from Products.ERP5Type.patches import OFSFile from Products.ERP5Type.patches import OFSFile
...@@ -77,7 +75,8 @@ from Products.ERP5Type.patches import make_hidden_input ...@@ -77,7 +75,8 @@ from Products.ERP5Type.patches import make_hidden_input
from Products.ERP5Type.patches import DemoStorage from Products.ERP5Type.patches import DemoStorage
from Products.ERP5Type.patches import unicodeconflictresolver from Products.ERP5Type.patches import unicodeconflictresolver
from Products.ERP5Type.patches import ZODBConnection 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 OFSHistory
from Products.ERP5Type.patches import OFSItem from Products.ERP5Type.patches import OFSItem
from Products.ERP5Type.patches import ExternalMethod from Products.ERP5Type.patches import ExternalMethod
...@@ -94,6 +93,9 @@ from Products.ERP5Type.patches import CachingPolicyManager ...@@ -94,6 +93,9 @@ from Products.ERP5Type.patches import CachingPolicyManager
from Products.ERP5Type.patches import AcceleratedHTTPCacheManager from Products.ERP5Type.patches import AcceleratedHTTPCacheManager
from Products.ERP5Type.patches import ExceptionFormatter from Products.ERP5Type.patches import ExceptionFormatter
if six.PY2: 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 # No ZServer, so no webdav
from Products.ERP5Type.patches import WebDAV from Products.ERP5Type.patches import WebDAV
from Products.ERP5Type.patches import DTMLMethod from Products.ERP5Type.patches import DTMLMethod
...@@ -107,7 +109,9 @@ if six.PY2: ...@@ -107,7 +109,9 @@ if six.PY2:
# No ZServer # No ZServer
from Products.ERP5Type.patches import Publish from Products.ERP5Type.patches import Publish
from Products.ERP5Type.patches import WSGITask 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 # These symbols are required for backward compatibility
from Products.ERP5Type.patches.PropertyManager import ERP5PropertyManager from Products.ERP5Type.patches.PropertyManager import ERP5PropertyManager
......
...@@ -32,7 +32,10 @@ ...@@ -32,7 +32,10 @@
""" """
from __future__ import absolute_import from __future__ import absolute_import
from App.config import getConfiguration 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 from zLOG import LOG, INFO
DISPLAY_BOOT_PROCESS = False DISPLAY_BOOT_PROCESS = False
......
...@@ -23,7 +23,9 @@ from App.ImageFile import ImageFile ...@@ -23,7 +23,9 @@ from App.ImageFile import ImageFile
from DocumentTemplate.DT_String import String from DocumentTemplate.DT_String import String
# Import from Localizer # Import from Localizer
from .patches import get_request import six
if six.PY2:
from .patches import get_request
from . import Localizer, MessageCatalog from . import Localizer, MessageCatalog
from .LocalFiles import LocalDTMLFile from .LocalFiles import LocalDTMLFile
......
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