[Checkins] SVN: relstorage/trunk/relstorage/relstorage.py Fixed compat. with ZODB 3.7 and 3.8

Shane Hathaway shane at hathawaymix.org
Sun Jul 12 05:33:01 EDT 2009


Log message for revision 101825:
  Fixed compat. with ZODB 3.7 and 3.8
  

Changed:
  U   relstorage/trunk/relstorage/relstorage.py

-=-
Modified: relstorage/trunk/relstorage/relstorage.py
===================================================================
--- relstorage/trunk/relstorage/relstorage.py	2009-07-12 07:49:01 UTC (rev 101824)
+++ relstorage/trunk/relstorage/relstorage.py	2009-07-12 09:33:00 UTC (rev 101825)
@@ -1189,16 +1189,18 @@
         self._txn_blobs[oid] = filename
 
     def copyTransactionsFrom(self, other):
-        # copied from ZODB.blob.BlobStorageMixin
+        # adapted from ZODB.blob.BlobStorageMixin
         for trans in other.iterator():
             self.tpc_begin(trans, trans.tid, trans.status)
             for record in trans:
                 blobfilename = None
-                if ZODB.blob.is_blob_record(record.data):
-                    try:
-                        blobfilename = other.loadBlob(record.oid, record.tid)
-                    except POSKeyError:
-                        pass
+                if self.fshelper is not None:
+                    if ZODB.blob.is_blob_record(record.data):
+                        try:
+                            blobfilename = other.loadBlob(
+                                record.oid, record.tid)
+                        except POSKeyError:
+                            pass
                 if blobfilename is not None:
                     fd, name = tempfile.mkstemp(
                         suffix='.tmp', dir=self.fshelper.temp_dir)



More information about the Checkins mailing list