Convert load calls to load_current

src/ZODB/tests/RecoveryStorage.py

@@ -91,8 +91,8 @@ class RecoveryStorage(IteratorDeepCompare):
         # And check to see that the root object exists, but not the other
         # objects.
         data, serial = load_current(self._dst, root._p_oid)
-        raises(KeyError, self._dst.load, obj1._p_oid, '')
-        raises(KeyError, self._dst.load, obj2._p_oid, '')
+        raises(KeyError, load_current, self._dst, obj1._p_oid)
+        raises(KeyError, load_current, self._dst, obj2._p_oid)
 
     def checkRestoreWithMultipleObjectsInUndoRedo(self):
         from ZODB.FileStorage import FileStorage

src/ZODB/tests/TransactionalUndoStorage.py

@@ -138,8 +138,7 @@ class TransactionalUndoStorage:
         info = self._storage.undoInfo()
         self._undo(info[4]["id"], [oid], note="undo3")
         # This should fail since we've undone the object's creation
-        self.assertRaises(KeyError,
-                          self._storage.load, oid, '')
+        self.assertRaises(KeyError, load_current, self._storage, oid)
 
         # And now let's try to redo the object's creation
         info = self._storage.undoInfo()
@@ -178,7 +177,7 @@ class TransactionalUndoStorage:
         # creation.  Let's undo the object creation.
         info = self._storage.undoInfo()
         self._undo(info[2]['id'], [oid])
-        self.assertRaises(KeyError, self._storage.load, oid, '')
+        self.assertRaises(KeyError, load_current, self._storage, oid)
 
         # Loading current data via loadBefore should raise a POSKeyError too:
         self.assertRaises(KeyError, self._storage.loadBefore, oid,