[Zope-Checkins] CVS: Zope/lib/python/AccessControl - SecurityInfo.py:1.16.32.1 SpecialUsers.py:1.4.70.1 User.py:1.176.14.2

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	SecurityInfo.py SpecialUsers.py User.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/AccessControl/SecurityInfo.py 1.16 => 1.16.32.1 ===
--- Zope/lib/python/AccessControl/SecurityInfo.py:1.16	Thu Nov 21 12:43:17 2002
+++ Zope/lib/python/AccessControl/SecurityInfo.py	Mon Jul 21 12:35:07 2003
@@ -206,8 +206,8 @@
         return
     del _moduleSecurity[mname]
 
-    if len(imp):
-        apply(__import__, (mname,) + tuple(imp))
+    if imp:
+        __import__(mname, *imp)
     module = sys.modules[mname]
     modsec.apply(module.__dict__)
     _appliedModuleSecurity[mname] = modsec


=== Zope/lib/python/AccessControl/SpecialUsers.py 1.4 => 1.4.70.1 ===
--- Zope/lib/python/AccessControl/SpecialUsers.py:1.4	Wed Aug 14 17:29:07 2002
+++ Zope/lib/python/AccessControl/SpecialUsers.py	Mon Jul 21 12:35:07 2003
@@ -7,11 +7,22 @@
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-__doc__='''Place to find special users
+"""Place to find special users
 
-This is needed to avoid a circular import problem.
-$Id$'''
+This is needed to avoid a circular import problem.  The 'real' values
+are stored here by the AccessControl.User module as part of it's
+initialization.
+
+$Id$
+"""
 __version__='$Revision$'[11:-2]
+
+nobody = None
+system = None
+emergency_user = None
+
+# Note: use of the 'super' name is deprecated.
+super = None


=== Zope/lib/python/AccessControl/User.py 1.176.14.1 => 1.176.14.2 ===
--- Zope/lib/python/AccessControl/User.py:1.176.14.1	Mon Jun 30 09:40:02 2003
+++ Zope/lib/python/AccessControl/User.py	Mon Jul 21 12:35:07 2003
@@ -1020,11 +1020,7 @@
         data=self.data
         names=data.keys()
         names.sort()
-        users=[]
-        f=users.append
-        for n in names:
-            f(data[n])
-        return users
+        return [data[n] for n in names]
 
     def getUser(self, name):
         """Return the named user object or None"""