[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ Restore compatibility with Zope 2.10

[Wichert Akkerman]

Log message for revision 97541:
  Restore compatibility with Zope 2.10

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/context.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/differ.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/registry.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tool.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/utils.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/context.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/context.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/context.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -29,7 +29,11 @@
 from Acquisition import aq_parent
 from Acquisition import aq_self
 from Acquisition import Implicit
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
 from DateTime.DateTime import DateTime
 from OFS.DTMLDocument import DTMLDocument
 from OFS.Folder import Folder

Modified: Products.GenericSetup/trunk/Products/GenericSetup/differ.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/differ.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/differ.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -19,7 +19,11 @@
 import re
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
 
 from Products.GenericSetup.interfaces import SKIPPED_FILES
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/registry.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/registry.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/registry.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -20,7 +20,12 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
+
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import implements
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -17,7 +17,11 @@
 
 from AccessControl.Permission import Permission
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from Products.GenericSetup.permissions import ManagePortal

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -20,7 +20,11 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
 from OFS.Folder import Folder
 from OFS.SimpleItem import SimpleItem
 from Products.Five.component import enableSite

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tool.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tool.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -22,7 +22,11 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
 from OFS.Folder import Folder
 from OFS.Image import File
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile

Modified: Products.GenericSetup/trunk/Products/GenericSetup/utils.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/utils.py	2009-03-05 17:45:43 UTC (rev 97540)
+++ Products.GenericSetup/trunk/Products/GenericSetup/utils.py	2009-03-05 17:47:04 UTC (rev 97541)
@@ -28,7 +28,11 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    # BBB for Zope <2.11
+    from Globals import InitializeClass
 from App.Common import package_home
 from OFS.interfaces import IOrderedContainer
 from Products.Five.utilities.interfaces import IMarkerInterfaces