Merge from master.

.gitignore

 *.pyc
 __pycache__
-src/*.egg-info
-benchmark/*.egg-info
-
+*.egg-info
 .installed.cfg
 .tox
 bin

.travis.yml

+language: python
+python:
+    - 2.6
+    - 2.7
+install:
+    - python bootstrap.py
+    - bin/buildout
+script:
+    - bin/test -v1
+notifications:
+    email: false

src/ZEO/ClientStorage.py

@@ -1024,7 +1024,8 @@ class ClientStorage(object):
             else:
                 # We're using a server shared cache.  If the file isn't
                 # here, it's not anywhere.
-                raise POSException.POSKeyError("No blob file", oid, serial)
+                raise POSException.POSKeyError(
+                        "No blob file at %s" % blob_filename, oid, serial)
 
         if os.path.exists(blob_filename):
             return _accessed(blob_filename)
@@ -1112,19 +1113,20 @@ class ClientStorage(object):
         if self._is_read_only:
             raise POSException.ReadOnlyError()
         self._tpc_cond.acquire()
-        self._midtxn_disconnect = 0
-        while self._transaction is not None:
-            # It is allowable for a client to call two tpc_begins in a
-            # row with the same transaction, and the second of these
-            # must be ignored.
-            if self._transaction == txn:
-                self._tpc_cond.release()
-                raise POSException.StorageTransactionError(
-                    "Duplicate tpc_begin calls for same transaction")
-
-            self._tpc_cond.wait(30)
-        self._transaction = txn
-        self._tpc_cond.release()
+        try:
+            self._midtxn_disconnect = 0
+            while self._transaction is not None:
+                # It is allowable for a client to call two tpc_begins in a
+                # row with the same transaction, and the second of these
+                # must be ignored.
+                if self._transaction == txn:
+                    raise POSException.StorageTransactionError(
+                        "Duplicate tpc_begin calls for same transaction")
+
+                self._tpc_cond.wait(30)
+            self._transaction = txn
+        finally:
+            self._tpc_cond.release()
 
         try:
             self._server.tpc_begin(id(txn), txn.user, txn.description,
@@ -1144,9 +1146,11 @@ class ClientStorage(object):
         # the right way to set self._transaction to None
         # calls notify() on _tpc_cond in case there are waiting threads
         self._tpc_cond.acquire()
-        self._transaction = None
-        self._tpc_cond.notify()
-        self._tpc_cond.release()
+        try:
+            self._transaction = None
+            self._tpc_cond.notify()
+        finally:
+            self._tpc_cond.release()
 
     def lastTransaction(self):
         return self._cache.getLastTid()