[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/ Backported c113789 from trunk

[Hanno Schlichting]

Log message for revision 115542:
  Backported c113789 from trunk
  

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py
  U   Products.CMFCore/branches/2.2/Products/CMFCore/FSObject.py
  U   Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py	2010-08-08 10:34:20 UTC (rev 115541)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py	2010-08-08 10:36:11 UTC (rev 115542)
@@ -15,7 +15,12 @@
 $Id$
 """
 
-from AccessControl.Role import RoleManager
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    # BBB for Zope < 2.13
+    from AccessControl.Role import RoleManager
+
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from App.class_init import InitializeClass

Modified: Products.CMFCore/branches/2.2/Products/CMFCore/FSObject.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/FSObject.py	2010-08-08 10:34:20 UTC (rev 115541)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/FSObject.py	2010-08-08 10:36:11 UTC (rev 115542)
@@ -18,7 +18,12 @@
 import os
 
 from AccessControl.Permission import Permission
-from AccessControl.Role import RoleManager
+
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    # BBB for Zope < 2.13
+    from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
 from Acquisition import aq_inner

Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py	2010-08-08 10:34:20 UTC (rev 115541)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py	2010-08-08 10:36:11 UTC (rev 115542)
@@ -76,7 +76,12 @@
         from cStringIO import StringIO
         import urllib
 
-        from AccessControl.User import UserFolder
+        try:
+            from OFS.userfolder import UserFolder
+        except ImportError:
+            # BBB for Zope < 2.13
+            from AccessControl.User import UserFolder
+        
         from OFS.Folder import Folder
         from OFS.DTMLMethod import DTMLMethod