Commit c3858e2d authored by Aurel's avatar Aurel Committed by Jérome Perrin

zope4: Fix imports.

parent 58a49108
......@@ -22,7 +22,10 @@ from zLOG import LOG,ERROR,INFO,WARNING
from OFS.Image import File, Image
import os, transaction
from AccessControl import getSecurityManager, ClassSecurityInfo
from Globals import package_home
try:
from App.Common import package_home
except ImportError: # BBB Zope2
from Globals import package_home
import PIL.Image as PIL_Image
import thread
import random
......
......@@ -48,7 +48,10 @@ from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery, SimpleQuery
from Shared.DC.ZRDB.Results import Results
from Products.ERP5Type.Utils import mergeZRDBResults
from App.Extensions import getBrain
try: # BBB Zope 2.12
from App.Extensions import getBrain
except ImportError:
from Shared.DC.ZRDB.DA import getBrain
from MySQLdb import ProgrammingError
from MySQLdb.constants.ER import NO_SUCH_TABLE
......
......@@ -13,7 +13,8 @@
#
##############################################################################
from OFS.PropertySheets import DAVProperties, isDavCollection
from OFS.PropertySheets import DAVProperties
from webdav.common import isDavCollection
from Acquisition import aq_base
# This is required to make an ERP5 Document (folderish) look like a file (non folderish)
......
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