[Zope-Checkins] CVS: Packages/AccessControl - User.py:1.176.14.7

[Stefan H. Holek]

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

Modified Files:
      Tag: Zope-2_7-branch
	User.py 
Log Message:
Clarify getUserById as discussed on zope-dev.


=== Packages/AccessControl/User.py 1.176.14.6 => 1.176.14.7 ===
--- Packages/AccessControl/User.py:1.176.14.6	Fri Jan 30 11:44:43 2004
+++ Packages/AccessControl/User.py	Tue Jan 25 08:46:14 2005
@@ -488,16 +488,15 @@
         """Return the named user object or None"""
         raise NotImplementedError
 
-    def getUserById(self, id, default=_marker):
+    def getUserById(self, id, default=None):
         """Return the user corresponding to the given id.
         """
         # The connection between getting by ID and by name is not a strong
         # one
-        try:
-            return self.getUser(id)
-        except:
-            if default is _marker: raise
+        user = self.getUser(id)
+        if user is None:
             return default
+        return user
 
     def _doAddUser(self, name, password, roles, domains, **kw):
         """Create a new user. This should be implemented by subclasses to