[Zodb-checkins] SVN: ZODB/branches/matt-python-versions/src/ZEO/ Changed the way hash module is imported.

[matt@zope.com]

Log message for revision 93243:
  Changed the way hash module is imported.
  

Changed:
  U   ZODB/branches/matt-python-versions/src/ZEO/hash.py
  U   ZODB/branches/matt-python-versions/src/ZEO/zrpc/smac.py

-=-
Modified: ZODB/branches/matt-python-versions/src/ZEO/hash.py
===================================================================
--- ZODB/branches/matt-python-versions/src/ZEO/hash.py	2008-11-21 15:33:31 UTC (rev 93242)
+++ ZODB/branches/matt-python-versions/src/ZEO/hash.py	2008-11-21 16:06:39 UTC (rev 93243)
@@ -21,6 +21,7 @@
 if sys.version_info[:2] >= (2, 6):
     import hashlib
     sha1 = hashlib.sha1
+    new = sha1
 else:
     import sha
     sha1 = sha.new

Modified: ZODB/branches/matt-python-versions/src/ZEO/zrpc/smac.py
===================================================================
--- ZODB/branches/matt-python-versions/src/ZEO/zrpc/smac.py	2008-11-21 15:33:31 UTC (rev 93242)
+++ ZODB/branches/matt-python-versions/src/ZEO/zrpc/smac.py	2008-11-21 16:06:39 UTC (rev 93243)
@@ -36,11 +36,10 @@
 
 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
 # entries.   We expect that EWOULDBLOCK == EAGAIN on most systems --
 # or that only one is actually used.