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

[Tres Seaver]

Update of /cvs-repository/CMF/CMFWorkspaces
In directory cvs.zope.org:/tmp/cvs-serv26823

Modified Files:
	permissions.py 
Log Message:
 - Work around older permissions.


=== CMF/CMFWorkspaces/permissions.py 1.2 => 1.3 ===
--- CMF/CMFWorkspaces/permissions.py:1.2	Thu Apr 29 12:13:23 2004
+++ CMF/CMFWorkspaces/permissions.py	Wed Jan 19 15:13:59 2005
@@ -7,13 +7,22 @@
 security = ModuleSecurityInfo('Products.CMFWorkspace.permissions')
 
 security.declarePublic('AddPortalFolders')
-from Products.CMFCore.permissions import AddPortalFolders
+try:
+    from Products.CMFCore.permissions import AddPortalFolders
+except ImportError:
+    from Products.CMFCore.CMFCorePermissions import AddPortalFolders
 
 security.declarePublic('ManagePortal')
-from Products.CMFCore.permissions import ManagePortal
+try:
+    from Products.CMFCore.permissions import ManagePortal
+except ImportError:
+    from Products.CMFCore.CMFCorePermissions import ManagePortal
 
 security.declarePublic('View')
-from Products.CMFCore.permissions import View
+try:
+    from Products.CMFCore.permissions import View
+except ImportError:
+    from Products.CMFCore.CMFCorePermissions import View
 
 security.declarePublic('ManageWorkspaces')
 ManageWorkspaces = 'Manage Workspaces'