[Checkins] SVN: relstorage/branches/1.4.0-fastimport/relstorage/storage.py Fixed TypeError in copyTransactionsFrom when the length of record.data cannot be calculated.

Maurits van Rees m.van.rees at zestsoftware.nl
Thu Jan 6 08:45:23 EST 2011


Log message for revision 119420:
  Fixed TypeError in copyTransactionsFrom when the length of record.data cannot be calculated.

Changed:
  U   relstorage/branches/1.4.0-fastimport/relstorage/storage.py

-=-
Modified: relstorage/branches/1.4.0-fastimport/relstorage/storage.py
===================================================================
--- relstorage/branches/1.4.0-fastimport/relstorage/storage.py	2011-01-06 13:44:31 UTC (rev 119419)
+++ relstorage/branches/1.4.0-fastimport/relstorage/storage.py	2011-01-06 13:45:23 UTC (rev 119420)
@@ -1431,7 +1431,11 @@
                     self.restore(record.oid, record.tid, record.data,
                                  '', record.data_txn, trans, txnum)
                 num_txn_records += 1
-                tx_size += len(record.data)
+                try:
+                    tx_size += len(record.data)
+                except TypeError:
+                    # data is probably None
+                    pass
             txnum += 1
             tx_end = time.time()
             pct_complete = (txnum/float(num_txns))*100



More information about the checkins mailing list