[Zodb-checkins] CVS: ZODB4/src/zodb/zeo - server.py:1.12.2.2 client.py:1.13.2.3

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/src/zodb/zeo
In directory cvs.zope.org:/tmp/cvs-serv3101

Modified Files:
      Tag: ZODB3-2-merge
	server.py client.py 
Log Message:
Port authentication code and various bug fixes to ZODB4.


=== ZODB4/src/zodb/zeo/server.py 1.12.2.1 => 1.12.2.2 ===
--- ZODB4/src/zodb/zeo/server.py:1.12.2.1	Tue Jun 17 17:59:24 2003
+++ ZODB4/src/zodb/zeo/server.py	Wed Jun 18 17:44:13 2003
@@ -695,25 +695,26 @@
 
     def _setup_auth(self, protocol):
         # Can't be done in global scope, because of cyclic references
-        from ZEO.auth import get_module
+        from zodb.zeo.auth import get_module
 
         name = self.__class__.__name__
 
         module = get_module(protocol)
         if not module:
-            log("%s: no such an auth protocol: %s" % (name, protocol))
+            self.logger.info("%s: no such an auth protocol: %s",
+                             name, protocol)
             return
         
         storage_class, client, db_class = module
         
         if not storage_class or not issubclass(storage_class, ZEOStorage):
-            log(("%s: %s isn't a valid protocol, must have a StorageClass" %
-                 (name, protocol)))
+            self.logger.info("%s: %s isn't a valid protocol, "
+                             "must have a StorageClass", name, protocol)
             self.auth_protocol = None
             return
         self.ZEOStorageClass = storage_class
 
-        log("%s: using auth protocol: %s" % (name, protocol))
+        self.logger.info("%s: using auth protocol: %s", name, protocol)
         
         # We create a Database instance here for use with the authenticator
         # modules. Having one instance allows it to be shared between multiple


=== ZODB4/src/zodb/zeo/client.py 1.13.2.2 => 1.13.2.3 ===
--- ZODB4/src/zodb/zeo/client.py:1.13.2.2	Wed Jun 18 14:22:07 2003
+++ ZODB4/src/zodb/zeo/client.py	Wed Jun 18 17:44:13 2003
@@ -33,6 +33,7 @@
 from zope.interface import directlyProvides, implements
 
 from zodb.zeo import cache
+from zodb.zeo.auth import get_module
 from zodb.zeo.stubs import StorageServerStub
 from zodb.zeo.tbuf import TransactionBuffer
 from zodb.zeo.zrpc.client import ConnectionManager