r13530 - in Products.PortalTransforms/trunk: . Products/PortalTransforms

Author: davisagli
Date: Sat Mar 26 02:24:46 2011
New Revision: 13530

Modified:
   Products.PortalTransforms/trunk/CHANGES.txt
   Products.PortalTransforms/trunk/Products/PortalTransforms/chain.py
Log:
avoid deprecation warning

Modified: Products.PortalTransforms/trunk/CHANGES.txt
==============================================================================
--- Products.PortalTransforms/trunk/CHANGES.txt	(original)
+++ Products.PortalTransforms/trunk/CHANGES.txt	Sat Mar 26 02:24:46 2011
@@ -4,6 +4,9 @@
 2.0.6 - Unreleased
 ------------------
 
+- Update RoleManager import to avoid deprecation warning on Zope 2.13.
+  [davisagli]
+
 2.0.5 - 2011-02-26
 ------------------
 

Modified: Products.PortalTransforms/trunk/Products/PortalTransforms/chain.py
==============================================================================
--- Products.PortalTransforms/trunk/Products/PortalTransforms/chain.py	(original)
+++ Products.PortalTransforms/trunk/Products/PortalTransforms/chain.py	Sat Mar 26 02:24:46 2011
@@ -5,7 +5,6 @@
 from App.class_init import InitializeClass
 from Acquisition import Implicit
 from OFS.SimpleItem import Item
-from AccessControl.Role import RoleManager
 from AccessControl import ClassSecurityInfo
 
 from Products.CMFCore.permissions import ManagePortal, ManageProperties
@@ -18,6 +17,11 @@
 
 from UserList import UserList
 
+try:
+    from OFS.role import RoleManager
+except ImportError:
+    # Zope <=2.12
+    from AccessControl.Role import RoleManager
 
 class chain(UserList):
     """A chain of transforms used to transform data"""

------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software 
be a part of the solution? Download the Intel(R) Manageability Checker 
today! http://p.sf.net/sfu/intel-dev2devmar