[CMF-checkins] CVS: CMF/CMFCollector - permissions.py:1.4.2.1 CollectorPermissions.py:NONE

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-post_1_5-cleanup-branch
	permissions.py 
Removed Files:
      Tag: yuppie-post_1_5-cleanup-branch
	CollectorPermissions.py 
Log Message:
- removed deprecated permissions modules


=== CMF/CMFCollector/permissions.py 1.4 => 1.4.2.1 ===
--- CMF/CMFCollector/permissions.py:1.4	Wed Aug 25 15:54:20 2004
+++ CMF/CMFCollector/permissions.py	Sun Sep 12 13:31:45 2004
@@ -4,10 +4,7 @@
 """
 from AccessControl import ModuleSecurityInfo
 
-try:
-    from Products.CMFCore import permissions as core_permissions
-except ImportError: # CMF < 1.5
-    from Products.CMFCore import CMFCorePermissions as core_permissions
+from Products.CMFCore import permissions as core_permissions
 
 setDefaultRoles = core_permissions.setDefaultRoles
 

=== Removed File CMF/CMFCollector/CollectorPermissions.py ===