[CMF-checkins] CVS: CMF/CMFCollector - permissions.py:1.4

[Tres Seaver]

Update of /cvs-repository/CMF/CMFCollector
In directory cvs.zope.org:/tmp/cvs-serv3418

Modified Files:
	permissions.py 
Log Message:


  - CMF Collector #274:  permissiongeddon broke CMFCollector for CMF < 1.5.


=== CMF/CMFCollector/permissions.py 1.3 => 1.4 ===
--- CMF/CMFCollector/permissions.py:1.3	Fri Jul 16 05:39:37 2004
+++ CMF/CMFCollector/permissions.py	Wed Aug 25 15:54:20 2004
@@ -3,24 +3,30 @@
 $Id$
 """
 from AccessControl import ModuleSecurityInfo
-from Products.CMFCore.permissions import setDefaultRoles
+
+try:
+    from Products.CMFCore import permissions as core_permissions
+except ImportError: # CMF < 1.5
+    from Products.CMFCore import CMFCorePermissions as core_permissions
+
+setDefaultRoles = core_permissions.setDefaultRoles
 
 security = ModuleSecurityInfo('Products.CMFCollector.permissions')
 
 security.declarePublic('View')
-from Products.CMFCore.permissions import View
+View = core_permissions.View
 
 security.declarePublic('AddPortalContent')
-from Products.CMFCore.permissions import AddPortalContent
+AddPortalContent = core_permissions.AddPortalContent
 
 security.declarePublic('AccessInactivePortalContent')
-from Products.CMFCore.permissions import AccessInactivePortalContent
+AccessInactivePortalContent = core_permissions.AccessInactivePortalContent
 
 security.declarePublic('AccessFuturePortalContent')
-from Products.CMFCore.permissions import AccessFuturePortalContent
+AccessFuturePortalContent = core_permissions.AccessFuturePortalContent
 
 security.declarePublic('ModifyPortalContent')
-from Products.CMFCore.permissions import ModifyPortalContent
+ModifyPortalContent = core_permissions.ModifyPortalContent
 
 security.declarePublic('ViewCollector')
 ViewCollector = View
@@ -49,3 +55,5 @@
 security.declarePublic('SupportIssue')
 SupportIssue = 'Support collector issue'
 setDefaultRoles(SupportIssue, ('Manager', 'Reviewer'))
+
+del setDefaultRoles, core_permissions