[Checkins] SVN: Products.ZSQLMethods/trunk/ Actually establish Zope 2.12 compatibility by dealing with all cases of moved classes and functions.

[Hanno Schlichting]

Log message for revision 114439:
  Actually establish Zope 2.12 compatibility by dealing with all cases of moved classes and functions.
  

Changed:
  U   Products.ZSQLMethods/trunk/CHANGES.txt
  U   Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py
  U   Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py

-=-
Modified: Products.ZSQLMethods/trunk/CHANGES.txt
===================================================================
--- Products.ZSQLMethods/trunk/CHANGES.txt	2010-07-09 20:41:13 UTC (rev 114438)
+++ Products.ZSQLMethods/trunk/CHANGES.txt	2010-07-09 20:51:49 UTC (rev 114439)
@@ -4,6 +4,8 @@
 2.13.2 (unreleased)
 -------------------
 
+- Actually establish Zope 2.12 compatibility by dealing with all cases of
+  moved classes and functions.
 
 2.13.1 (2010-07-09)
 -------------------

Modified: Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py	2010-07-09 20:41:13 UTC (rev 114438)
+++ Products.ZSQLMethods/trunk/src/Products/ZSQLMethods/SQL.py	2010-07-09 20:51:49 UTC (rev 114439)
@@ -11,13 +11,18 @@
 #
 ##############################################################################
 
-from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import change_database_methods
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from App.special_dtml import DTMLFile
 from Shared.DC.ZRDB.DA import DA
 
+# BBB Zope 2.12
+try:
+    from AccessControl.class_init import InitializeClass
+except ImportError:
+    from App.class_init import InitializeClass
 
+
 def SQLConnectionIDs(self):
     """Find SQL database connections in the current folder and above
 

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py	2010-07-09 20:41:13 UTC (rev 114438)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Aqueduct.py	2010-07-09 20:51:49 UTC (rev 114439)
@@ -22,12 +22,17 @@
 from DateTime.DateTime import DateTime
 from DocumentTemplate import File
 from DocumentTemplate import HTML
-from OFS.role import RoleManager
 from OFS.SimpleItem import Item
 from Persistence import Persistent
 from zExceptions import Redirect
 
+# BBB Zope 2.12
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    from AccessControl.Role import RoleManager
 
+
 dtml_dir=os.path.join(package_home(globals()), 'dtml')
 
 InvalidParameter='Invalid Parameter'

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py	2010-07-09 20:41:13 UTC (rev 114438)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/Connection.py	2010-07-09 20:51:49 UTC (rev 114439)
@@ -18,7 +18,6 @@
 import string
 import sys
 
-from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import view_management_screens
 from AccessControl.Permissions import change_database_connections
 from AccessControl.Permissions import test_database_connections
@@ -29,11 +28,23 @@
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
 from DocumentTemplate import HTML
-from OFS.role import RoleManager
 from OFS.SimpleItem import Item
 from Persistence import Persistent
 from zExceptions import BadRequest
 
+# BBB Zope 2.12
+try:
+    from AccessControl.class_init import InitializeClass
+except ImportError:
+    from App.class_init import InitializeClass
+
+# BBB Zope 2.12
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    from AccessControl.Role import RoleManager
+
+
 from Aqueduct import custom_default_report
 import RDB
 from Results import Results

Modified: Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py
===================================================================
--- Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py	2010-07-09 20:41:13 UTC (rev 114438)
+++ Products.ZSQLMethods/trunk/src/Shared/DC/ZRDB/DA.py	2010-07-09 20:51:49 UTC (rev 114439)
@@ -18,7 +18,6 @@
 import sys
 from time import time
 
-from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import change_database_methods
 from AccessControl.Permissions import use_database_methods
 from AccessControl.Permissions import view_management_screens
@@ -29,17 +28,33 @@
 from App.special_dtml import DTMLFile
 from DocumentTemplate import HTML
 from DocumentTemplate.html_quote import html_quote
-from DocumentTemplate.security import RestrictedDTML
 from DateTime.DateTime import DateTime
 from ExtensionClass import Base
 from BTrees.OOBTree import OOBucket as Bucket
-from OFS.role import RoleManager
 from OFS.SimpleItem import Item
 from Persistence import Persistent
 from webdav.Resource import Resource
 from webdav.Lockable import ResourceLockedError
 from zExceptions import BadRequest
 
+# BBB Zope 2.12
+try:
+    from AccessControl.class_init import InitializeClass
+except ImportError:
+    from App.class_init import InitializeClass
+
+# BBB Zope 2.12
+try:
+    from DocumentTemplate.security import RestrictedDTML
+except ImportError:
+    from AccessControl.DTML import RestrictedDTML
+
+# BBB Zope 2.12
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    from AccessControl.Role import RoleManager
+
 from Aqueduct import BaseQuery
 from Aqueduct import custom_default_report
 from Aqueduct import default_input_form