[Zope-Checkins] CVS: Zope/lib/python/AccessControl - Role.py:1.53

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv8238

Modified Files:
	Role.py 
Log Message:
merge from 2.5 branch (string methods)

=== Zope/lib/python/AccessControl/Role.py 1.52 => 1.53 ===
 
 from Globals import DTMLFile, MessageDialog, Dictionary
-from string import join, strip, split, find
 from Acquisition import Implicit, Acquired, aq_get
 import Globals, ExtensionClass, PermissionMapping, Products
 from Permission import Permission
@@ -209,7 +208,7 @@
         if fails:
             return MessageDialog(title="Warning!",
                                  message="Some permissions had errors: "
-                                   + join(fails, ', '),
+                                   + ', '.join(fails),
                                  action='manage_access')
         return MessageDialog(
             title  ='Success!',
@@ -380,13 +379,13 @@
         data=[]
         _add=data.append
         for key, value in inst.items():
-            if find(key,'__roles__') >= 0:
+            if key.find('__roles__') >= 0:
                 _add({'name': key, 'value': value, 'class': 0})
             if hasattr(value, '__roles__'):
                 _add({'name': '%s.__roles__' % key, 'value': value.__roles__, 
                       'class': 0})
         for key, value in clas.items():
-            if find(key,'__roles__') >= 0:
+            if key.find('__roles__') >= 0:
                 _add({'name': key, 'value': value, 'class' : 1})
             if hasattr(value, '__roles__'):
                 _add({'name': '%s.__roles__' % key, 'value': value.__roles__,