[Zope-Checkins] CVS: ZODB3/ZEO/auth - base.py:1.7

Christian Reis kiko at async.com.br
Thu Dec 18 22:01:22 EST 2003


Update of /cvs-repository/ZODB3/ZEO/auth
In directory cvs.zope.org:/tmp/cvs-serv26606/auth

Modified Files:
	base.py 
Log Message:
Rework overzealous check when specifying realm to Database.


=== ZODB3/ZEO/auth/base.py 1.6 => 1.7 ===
--- ZODB3/ZEO/auth/base.py:1.6	Thu Dec 18 21:04:15 2003
+++ ZODB3/ZEO/auth/base.py	Thu Dec 18 22:01:22 2003
@@ -46,7 +46,7 @@
     usernames to password hashes. The hashes are SHA hex digests
     produced from the password string.
     """
-
+    realm = None
     def __init__(self, filename, realm=None):
         """Creates a new Database
 
@@ -60,11 +60,12 @@
         self._users = {}
         self.filename = filename
         self.load()
-        if self.realm and self.realm != realm:
-            raise ValueError, ("Specified realm %r differs from "
-                               "database realm %r" % (realm or '', self.realm))
-        else:
-            self.realm = realm
+        if realm:
+            if self.realm and self.realm != realm:
+                raise ValueError, ("Specified realm %r differs from database "
+                                   "realm %r" % (realm or '', self.realm))
+            else:
+                self.realm = realm
 
     def save(self, fd=None):
         filename = self.filename




More information about the Zope-Checkins mailing list