[Zope-Checkins] CVS: Zope/lib/python/AccessControl - Owned.py:1.15

Andreas Jung andreas@zope.com
Thu, 13 Dec 2001 09:24:03 -0500


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

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

=== Zope/lib/python/AccessControl/Owned.py 1.14 => 1.15 ===
 __version__='$Revision$'[11:-2]
 
-import Globals, urlparse, SpecialUsers, ExtensionClass, string
+import Globals, urlparse, SpecialUsers, ExtensionClass
 from AccessControl import getSecurityManager, Unauthorized
 from Acquisition import aq_get, aq_parent, aq_base
 
@@ -54,7 +54,7 @@
         """
         owner=self.getOwner(1)
         if owner is None or owner is UnownableOwner: return owner
-        d={'path': string.join(owner[0], '/'), 'id': owner[1],
+        d={'path': '/'.join(owner[0]), 'id': owner[1],
            'explicit': hasattr(self, '_owner'),
            'userCanChangeOwnershipType':
            getSecurityManager().checkPermission('Take ownership', self)