[Zodb-checkins] SVN: ZODB/branches/matt-python2.6/src/ZEO/ Fixed hash errors, still testing connectivity problems.

[matt@zope.com]

Log message for revision 93051:
  Fixed hash errors, still testing connectivity problems.
  

Changed:
  U   ZODB/branches/matt-python2.6/src/ZEO/auth/auth_digest.py
  U   ZODB/branches/matt-python2.6/src/ZEO/auth/base.py
  U   ZODB/branches/matt-python2.6/src/ZEO/tests/auth_plaintext.py
  U   ZODB/branches/matt-python2.6/src/ZEO/zrpc/smac.py

-=-
Modified: ZODB/branches/matt-python2.6/src/ZEO/auth/auth_digest.py
===================================================================
--- ZODB/branches/matt-python2.6/src/ZEO/auth/auth_digest.py	2008-11-17 14:25:50 UTC (rev 93050)
+++ ZODB/branches/matt-python2.6/src/ZEO/auth/auth_digest.py	2008-11-17 16:22:08 UTC (rev 93051)
@@ -43,7 +43,7 @@
 from ZEO.Exceptions import AuthError
 from ZEO.StorageServer import ZEOStorage
 from ZEO.auth.base import Database, Client
-import ZEO.hash
+from ZEO.hash import sha1
 
 def get_random_bytes(n=8):
     if os.path.exists("/dev/urandom"):

Modified: ZODB/branches/matt-python2.6/src/ZEO/auth/base.py
===================================================================
--- ZODB/branches/matt-python2.6/src/ZEO/auth/base.py	2008-11-17 14:25:50 UTC (rev 93050)
+++ ZODB/branches/matt-python2.6/src/ZEO/auth/base.py	2008-11-17 16:22:08 UTC (rev 93051)
@@ -19,7 +19,7 @@
 
 import os
 
-import ZEO.hash
+from ZEO.hash import sha1
 
 class Client:
     # Subclass should override to list the names of methods that

Modified: ZODB/branches/matt-python2.6/src/ZEO/tests/auth_plaintext.py
===================================================================
--- ZODB/branches/matt-python2.6/src/ZEO/tests/auth_plaintext.py	2008-11-17 14:25:50 UTC (rev 93050)
+++ ZODB/branches/matt-python2.6/src/ZEO/tests/auth_plaintext.py	2008-11-17 16:22:08 UTC (rev 93051)
@@ -22,7 +22,7 @@
 from ZEO.StorageServer import ZEOStorage
 from ZEO.auth import register_module
 from ZEO.auth.base import Client, Database
-import ZEO.hash
+from ZEO.hash import sha1
 
 def session_key(username, realm, password):
     return sha1("%s:%s:%s" % (username, realm, password)).hexdigest()

Modified: ZODB/branches/matt-python2.6/src/ZEO/zrpc/smac.py
===================================================================
--- ZODB/branches/matt-python2.6/src/ZEO/zrpc/smac.py	2008-11-17 14:25:50 UTC (rev 93050)
+++ ZODB/branches/matt-python2.6/src/ZEO/zrpc/smac.py	2008-11-17 16:22:08 UTC (rev 93051)
@@ -39,9 +39,9 @@
 
 from ZODB.loglevels import TRACE
 
+from ZEO.hash import sha1
 from ZEO.zrpc.error import DisconnectedError
 from ZEO.zrpc.log import log, short_repr
-import ZEO.hash
 
 
 # Use the dictionary to make sure we get the minimum number of errno