[Zope-Checkins] CVS: Zope/lib/python/AccessControl - AuthEncoding.py:1.5.2.1 Owned.py:1.14.2.1 Permission.py:1.8.2.1 PermissionMapping.py:1.10.2.1 PermissionRole.py:1.14.2.1 Role.py:1.52.2.1 SecurityInfo.py:1.10.2.1 SecurityManager.py:1.11.2.1 User.py:1.163.2.4 ZopeSecurityPolicy.py:1.16.2.1
Andreas Jung
andreas@zope.com
Thu, 13 Dec 2001 09:04:35 -0500
Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv31678/lib/python/AccessControl
Modified Files:
Tag: Zope-2_5-branch
AuthEncoding.py Owned.py Permission.py PermissionMapping.py
PermissionRole.py Role.py SecurityInfo.py SecurityManager.py
User.py ZopeSecurityPolicy.py
Log Message:
- replace string module calls by string methods where possible
=== Zope/lib/python/AccessControl/AuthEncoding.py 1.5 => 1.5.2.1 ===
import sha, binascii
from binascii import b2a_base64, a2b_base64
-from string import upper
from random import choice, randrange
=== Zope/lib/python/AccessControl/Owned.py 1.14 => 1.14.2.1 ===
__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)
=== Zope/lib/python/AccessControl/Permission.py 1.8 => 1.8.2.1 ===
name_trans=filter(lambda c, an=string.letters+string.digits+'_': c not in an,
map(chr,range(256)))
-name_trans=string.maketrans(string.join(name_trans,''), '_'*len(name_trans))
+name_trans=string.maketrans(''.join(name_trans), '_'*len(name_trans))
def pname(name, translate=string.translate, name_trans=name_trans):
return '_'+translate(name,name_trans)+"_Permission"
=== Zope/lib/python/AccessControl/PermissionMapping.py 1.10 => 1.10.2.1 ===
# We want to make sure that any non-explicitly set methods are
# private!
- if name[:1]=='_' and name[-11:]=="_Permission": return ''
+ if name.startswith('_') and name.endswith("_Permission"): return ''
raise AttributeError, name
PermissionMapper=PM
=== Zope/lib/python/AccessControl/PermissionRole.py 1.14 => 1.14.2.1 ===
name_trans=filter(lambda c, an=string.letters+string.digits+'_': c not in an,
map(chr,range(256)))
- name_trans=string.maketrans(string.join(name_trans,''), '_'*len(name_trans))
+ name_trans=string.maketrans(''.join(name_trans), '_'*len(name_trans))
def rolesForPermissionOn(perm, object, default=('Manager',)):
"""Return the roles that have the given permission on the given object
=== Zope/lib/python/AccessControl/Role.py 1.52 => 1.52.2.1 ===
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__,
=== Zope/lib/python/AccessControl/SecurityInfo.py 1.10 => 1.10.2.1 ===
import Acquisition, PermissionRole, sys
-from string import lower
from zLOG import LOG, WARNING
@@ -127,7 +126,7 @@
booleans, or a callable (name, value) -> boolean.
"""
if type(access) == type(''):
- access = lower(access)
+ access = access.lower()
if access == 'allow':
access = 1
elif access == 'deny':
=== Zope/lib/python/AccessControl/SecurityManager.py 1.11 => 1.11.2.1 ===
__version__='$Revision$'[11:-2]
-import ZopeSecurityPolicy, os, string
+import ZopeSecurityPolicy, os
_noroles = ZopeSecurityPolicy._noroles
-try: max_stack_size=string.atoi(os.environ.get('Z_MAX_STACK_SIZE','100'))
+try: max_stack_size=int(os.environ.get('Z_MAX_STACK_SIZE','100'))
except: max_stack_size=100
if os.environ.has_key("ZSP_OWNEROUS_SKIP"): ownerous=0
=== Zope/lib/python/AccessControl/User.py 1.163.2.3 => 1.163.2.4 ===
import os
from Globals import DTMLFile, MessageDialog, Persistent, PersistentMapping
-from string import join, strip, split, lower, upper
from App.Management import Navigation, Tabs
from Acquisition import Implicit
from OFS.SimpleItem import Item
@@ -399,9 +398,9 @@
return None
if line:
- data = split(strip(line), ':')
+ data = line.strip().split(':')
remote_user_mode = not data[1]
- try: ds = split(data[2], ' ')
+ try: ds = data[2].split(' ')
except: ds = []
return data[0], data[1], ds, remote_user_mode
else:
@@ -559,9 +558,10 @@
def identify(self, auth):
- if auth and lower(auth[:6])=='basic ':
- try: name, password=tuple(split(decodestring(
- split(auth)[-1]), ':', 1))
+ if auth and auth.lower().startswith('basic '):
+ try: name, password=tuple(
+ decodestring(auth.split()[-1]).split(':', 1)
+ )
except:
raise 'Bad Request', 'Invalid authentication token'
return name, password
@@ -1126,14 +1126,14 @@
except: pass
- _host=split(host, '.')
- _addr=split(addr, '.')
+ _host=host.split('.')
+ _addr=addr.split('.')
_hlen=len(_host)
_alen=len(_addr)
for ob in spec:
sz=len(ob)
- _ob=split(ob, '.')
+ _ob=ob.split('.')
_sz=len(_ob)
mo = addr_match(ob)
=== Zope/lib/python/AccessControl/ZopeSecurityPolicy.py 1.16 => 1.16.2.1 ===
# Provide special rules for the acquisition attributes
if type(name) is StringType:
- if name[:3]=='aq_' and name not in valid_aq_:
+ if name.startswith('aq_') and name not in valid_aq_:
return 0
containerbase = aq_base(container)