[Zope-Checkins] CVS: Packages/AccessControl - Owned.py:1.19 PermissionRole.py:1.17 ZopeSecurityPolicy.py:1.21

[Guido van Rossum]

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

Modified Files:
	Owned.py PermissionRole.py ZopeSecurityPolicy.py 
Log Message:
Get rid of arguments named None.
This is a SyntaxWarning in Python 2.3 and will be an error in 2.4.

=== Packages/AccessControl/Owned.py 1.18 => 1.19 ===
--- Packages/AccessControl/Owned.py:1.18	Wed Aug 14 17:29:07 2002
+++ Packages/AccessControl/Owned.py	Tue Oct  1 10:09:46 2002
@@ -63,7 +63,7 @@
 
     getOwner__roles__=()
     def getOwner(self, info=0,
-                 aq_get=aq_get, None=None,
+                 aq_get=aq_get,
                  UnownableOwner=UnownableOwner,
                  getSecurityManager=getSecurityManager,
                  ):
@@ -90,7 +90,7 @@
 
     changeOwnership__roles__=()
     def changeOwnership(self, user, recursive=0,
-                        aq_get=aq_get, None=None,
+                        aq_get=aq_get,
                         ):
         """Change the ownership to the given user.  If 'recursive' is
         true then also take ownership of all sub-objects, otherwise
@@ -231,7 +231,7 @@
     return attr
 
 def ownerInfo(user,
-              getattr=getattr, type=type, st=type(''), None=None):
+              getattr=getattr, type=type, st=type('')):
     if user is None:
         return None
     uid=user.getId()


=== Packages/AccessControl/PermissionRole.py 1.16 => 1.17 ===
--- Packages/AccessControl/PermissionRole.py:1.16	Wed Aug 14 17:29:07 2002
+++ Packages/AccessControl/PermissionRole.py	Tue Oct  1 10:09:46 2002
@@ -66,7 +66,7 @@
             self._p='_'+string.translate(name,name_trans)+"_Permission"
             self._d=default
 
-        def __of__(self, parent, None=None, getattr=getattr):
+        def __of__(self, parent, getattr=getattr):
             r=imPermissionRole()
             r._p=self._p
             r._pa=parent
@@ -85,7 +85,7 @@
         """Implement permission-based roles
         """
 
-        def __of__(self, parent,tt=type(()),st=type(''),getattr=getattr,None=None):
+        def __of__(self, parent,tt=type(()),st=type(''),getattr=getattr):
             obj=parent
             n=self._p
             r=None


=== Packages/AccessControl/ZopeSecurityPolicy.py 1.20 => 1.21 ===
--- Packages/AccessControl/ZopeSecurityPolicy.py:1.20	Wed Aug 21 15:31:59 2002
+++ Packages/AccessControl/ZopeSecurityPolicy.py	Tue Oct  1 10:09:46 2002
@@ -75,7 +75,7 @@
             self._authenticated=authenticated
 
         def validate(self, accessed, container, name, value, context,
-                     roles=_noroles, None=None, type=type, IntType=type(0),
+                     roles=_noroles, type=type, IntType=type(0),
                      DictType=type({}), getattr=getattr, _noroles=_noroles,
                      StringType=type(''),
                      Containers=SimpleObjectPolicies.Containers,