zope4: Fix imports.

bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py

@@ -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

product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py

@@ -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
 

product/ERP5Type/patches/PropertySheets.py

@@ -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)