[Checkins] SVN: relstorage/trunk/relstorage/tests/RecoveryStorage.py ZODB 3.7 compat
Shane Hathaway
shane at hathawaymix.org
Fri Sep 25 04:31:18 EDT 2009
Log message for revision 104517:
ZODB 3.7 compat
Changed:
U relstorage/trunk/relstorage/tests/RecoveryStorage.py
-=-
Modified: relstorage/trunk/relstorage/tests/RecoveryStorage.py
===================================================================
--- relstorage/trunk/relstorage/tests/RecoveryStorage.py 2009-09-25 08:05:01 UTC (rev 104516)
+++ relstorage/trunk/relstorage/tests/RecoveryStorage.py 2009-09-25 08:31:17 UTC (rev 104517)
@@ -23,11 +23,16 @@
from ZODB import DB
import ZODB.POSException
from ZODB.serialize import referencesf
-import ZODB.blob
import time
+try:
+ from ZODB.blob import is_blob_record
+except ImportError:
+ def is_blob_record(data):
+ return False
+
class IteratorDeepCompare:
def compare(self, storage1, storage2):
@@ -69,7 +74,7 @@
eq(rec1.oid, rec2.oid)
eq(rec1.tid, rec2.tid)
eq(rec1.data, rec2.data)
- if ZODB.blob.is_blob_record(rec1.data):
+ if is_blob_record(rec1.data):
try:
fn1 = storage1.loadBlob(rec1.oid, rec1.tid)
except ZODB.POSException.POSKeyError:
@@ -101,7 +106,7 @@
src_objects = {} # {oid: (tid, data, blob or None)}
for txn in src.iterator():
for rec in txn:
- if ZODB.blob.is_blob_record(rec.data):
+ if is_blob_record(rec.data):
try:
fn = src.loadBlob(rec.oid, rec.tid)
except ZODB.POSException.POSKeyError:
@@ -115,7 +120,7 @@
unchecked = set(src_objects)
for txn in dest.iterator():
for rec in txn:
- if ZODB.blob.is_blob_record(rec.data):
+ if is_blob_record(rec.data):
try:
fn = dest.loadBlob(rec.oid, rec.tid)
except ZODB.POSException.POSKeyError:
More information about the checkins
mailing list