[Zope-Checkins] CVS: Zope2 - User.py:1.145

[Brian Lloyd]

Update of /cvs-repository/Zope2/lib/python/AccessControl
In directory korak:/home/brian/temp/mainline_test/lib/python/AccessControl

Modified Files:
	User.py 
Log Message:
Merged fixes missed from 2.3 branch



--- Updated File User.py in package Zope2 --
--- User.py	2001/03/12 17:08:48	1.144
+++ User.py	2001/03/14 19:05:51	1.145
@@ -603,11 +603,10 @@
             # We found a user, his password was correct, and the user
             # wasn't the emergency user.  We need to authorize the user
             # against the published object.
-            if self.authorize(user.__of__(self), a, c, n, v, roles):
+            if self.authorize(user, a, c, n, v, roles):
                 return user.__of__(self)
             # That didn't work.  Try to authorize the anonymous user.
-            elif self._isTop() and self.authorize(self._nobody.__of__(self),
-                                                  a,c,n,v,roles):
+            elif self._isTop() and self.authorize(self._nobody,a,c,n,v,roles):
                 return self._nobody.__of__(self)
             else:
                 # we can't authorize the user, and we either can't authorize
@@ -627,8 +626,7 @@
                             if self.authenticate(
                                 user.getUserName(), '', request
                                 ):
-                                if self.authorize(user.__of__(self), a, c,
-                                                  n, v, roles):
+                                if self.authorize(user, a, c, n, v, roles):
                                     return user.__of__(self)
 
             user = self.getUser(name)
@@ -646,7 +644,7 @@
             elif user is None:
                 # we didn't find the username in this database
                 # try to authorize and return the anonymous user.
-                if self._isTop() and self.authorize(self._nobody.__of__(self),
+                if self._isTop() and self.authorize(self._nobody,
                                                     a, c, n, v, roles):
                     return self._nobody.__of__(self)
                 else:
@@ -656,11 +654,11 @@
             else:
                 # We found a user and the user wasn't the emergency user.
                 # We need to authorize the user against the published object.
-                if self.authorize(user.__of__(self), a, c, n, v, roles):
+                if self.authorize(user, a, c, n, v, roles):
                     return user.__of__(self)
                 # That didn't work.  Try to authorize the anonymous user.
                 elif self._isTop() and self.authorize(
-                    self._nobody.__of__(self), a, c, n, v, roles):
+                    self._nobody, a, c, n, v, roles):
                     return self._nobody.__of__(self)
                 else:
                     # we can't authorize the user, and we either can't