[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ Import paths from AccessControl updated to OFS for Zope 2.13
Charlie Clark
charlie at begeistert.org
Wed Jun 23 16:54:00 EDT 2010
Log message for revision 113789:
Import paths from AccessControl updated to OFS for Zope 2.13
Changed:
U Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
U Products.CMFCore/trunk/Products/CMFCore/FSObject.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py 2010-06-23 14:49:20 UTC (rev 113788)
+++ Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py 2010-06-23 20:53:59 UTC (rev 113789)
@@ -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/trunk/Products/CMFCore/FSObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2010-06-23 14:49:20 UTC (rev 113788)
+++ Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2010-06-23 20:53:59 UTC (rev 113789)
@@ -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/trunk/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py 2010-06-23 14:49:20 UTC (rev 113788)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py 2010-06-23 20:53:59 UTC (rev 113789)
@@ -75,7 +75,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
More information about the checkins
mailing list