Merge pull request #127 from zopefoundation/cleanup-check_checkCurrentSerialInTransaction

Cleaned up check_checkCurrentSerialInTransaction

doc/guide/transactions-and-threading.rst

@@ -187,7 +187,7 @@ So, for example, if we wanted to set a transaction note::
 .. -> src
 
    >>> exec(src)
-   >>> db.history(conn.root()._p_oid)[0]['description']
+   >>> str(db.history(conn.root()._p_oid)[0]['description'])
    'incrementing x again'
 
 Here, we used the

src/ZODB/tests/BasicStorage.py

@@ -233,8 +233,8 @@ class BasicStorage:
             self._storage.checkCurrentSerialInTransaction(oid, tid, t)
             self._storage.tpc_vote(t)
         except POSException.ReadConflictError as v:
-            self.assertTrue(v.oid) == oid
-            self.assertTrue(v.serials == (tid2, tid))
+            self.assertEqual(v.oid, oid)
+            self.assertEqual(v.serials, (tid2, tid))
         else:
             if 0: self.assertTrue(False, "No conflict error")