[CMF-checkins] CVS: CMF/CMFStaging - permissions.py:1.3

[Tres Seaver]

Update of /cvs-repository/CMF/CMFStaging
In directory cvs.zope.org:/tmp/cvs-serv8768

Modified Files:
	permissions.py 
Log Message:
 - We must stay compatible with CMF prior to permissiongeddon.


=== CMF/CMFStaging/permissions.py 1.2 => 1.3 ===
--- CMF/CMFStaging/permissions.py:1.2	Thu Apr 29 12:13:21 2004
+++ CMF/CMFStaging/permissions.py	Mon Oct  4 13:00:27 2004
@@ -3,10 +3,14 @@
 security = ModuleSecurityInfo('Products.CMFStaging.permissions')
 
 security.declarePublic('ManagePortal')
-from Products.CMFCore.permissions import ManagePortal
-
 security.declarePublic('ModifyPortalContent')
-from Products.CMFCore.permissions import ModifyPortalContent
+
+try:
+    from Products.CMFCore.permissions import ManagePortal
+    from Products.CMFCore.permissions import ModifyPortalContent
+except ImportError:
+    from Products.CMFCore.CMFCorePermissions import ManagePortal
+    from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
 
 security.declarePublic('StageObjects')
 StageObjects = 'Use version control'