using ZEO.hash

src/ZEO/zrpc/smac.py

@@ -27,14 +27,7 @@ is set to 1 and the MAC immediately follows the length.
 
 import asyncore
 import errno
-try:
-    import hmac
-except ImportError:
-    import _hmac as hmac
-try:
-    from hashlib import sha1 as sha
-except ImportError:
-    import sha
+import ZEO.hash
 import socket
 import struct
 import threading
@@ -45,7 +38,7 @@ from ZODB.loglevels import TRACE
 
 from ZEO.zrpc.log import log, short_repr
 from ZEO.zrpc.error import DisconnectedError
-
+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 --
@@ -150,8 +143,8 @@ class SizedMessageAsyncConnection(asyncore.dispatcher):
         # and thus iterator, because it contains a yield statement.
 
         def hack():
-            self.__hmac_send = hmac.HMAC(sesskey, digestmod=sha)
-            self.__hmac_recv = hmac.HMAC(sesskey, digestmod=sha)
+            self.__hmac_send = hmac.HMAC(sesskey, digestmod=ZEO.hash)
+            self.__hmac_recv = hmac.HMAC(sesskey, digestmod=ZEO.hash)
             if False:
                 yield ''
 

src/ZODB/POSException.py

@@ -15,6 +15,8 @@
 
 $Id$"""
 
+import sys
+
 from ZODB.utils import oid_repr, readable_tid_repr
 
 # BBB: We moved the two transactions to the transaction package
@@ -34,22 +36,38 @@ _recon.__no_side_effects__ = True
 class POSError(StandardError):
     """Persistent object system error."""
 
+    if sys.version_info[:2] == (2, 6):
+        # The 'message' attribute was deprecated for BaseException with
+        # Python 2.6; here we create descriptor properties to continue using it
+        def __set_message(self, v):
+            self.__dict__['message'] = v
+
+        def __get_message(self):
+            return self.__dict__['message']
+
+        def __del_message(self):
+            del self.__dict__['message']
+
+        message = property(__get_message, __set_message, __del_message)
+
+    if sys.version_info[:2] >= (2, 5):
         def __reduce__(self):
-        # Cope extra data from internal structures
+            # Copy extra data from internal structures
             state = self.__dict__.copy()
+            if sys.version_info[:2] == (2, 5):
                 state['message'] = self.message
             state['args'] = self.args
 
             return (_recon, (self.__class__, state))
 
-class POSKeyError(KeyError, POSError):
+class POSKeyError(POSError, KeyError):
     """Key not found in database."""
 
     def __str__(self):
         return oid_repr(self.args[0])
 
 
-class ConflictError(TransactionError):
+class ConflictError(POSError, TransactionError):
     """Two transactions tried to modify the same object at once.
 
     This transaction should be resubmitted.
@@ -213,7 +231,7 @@ class BTreesConflictError(ConflictError):
         return "BTrees conflict error at %d/%d/%d: %s" % (
             self.p1, self.p2, self.p3, self.msgs[self.reason])
 
-class DanglingReferenceError(TransactionError):
+class DanglingReferenceError(POSError, TransactionError):
     """An object has a persistent reference to a missing object.
 
     If an object is stored and it has a reference to another object