[CMF-checkins] CVS: CMF/CMFActionIcons - permissions.py:1.6

[Tres Seaver]

Update of /cvs-repository/CMF/CMFActionIcons
In directory cvs.zope.org:/tmp/cvs-serv9495

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


=== CMF/CMFActionIcons/permissions.py 1.5 => 1.6 ===
--- CMF/CMFActionIcons/permissions.py:1.5	Thu Aug 12 11:07:37 2004
+++ CMF/CMFActionIcons/permissions.py	Mon Oct  4 13:03:38 2004
@@ -19,7 +19,12 @@
 security = ModuleSecurityInfo('Products.CMFActionIcons.permissions')
 
 security.declarePublic('ManagePortal')
-from Products.CMFCore.permissions import ManagePortal
-
 security.declarePublic('View')
-from Products.CMFCore.permissions import View
+
+try:
+    from Products.CMFCore.permissions import ManagePortal
+    from Products.CMFCore.permissions import View
+except ImportError: # CMF < 1.5
+    from Products.CMFCore.CMFCorePermissions import ManagePortal
+    from Products.CMFCore.CMFCorePermissions import View
+