Commit 764b41c0 authored by Julien Muchembled's avatar Julien Muchembled

importer: fix resuming

parent 58cf9e24
......@@ -111,6 +111,8 @@ class ZODB(object):
return translate(data)
def __getattr__(self, attr):
if attr == '__setstate__':
return object.__getattribute__(self, attr)
return getattr(, attr)
def getDataTid(self, oid, tid):
......@@ -302,8 +304,8 @@ class ImporterDatabaseManager(DatabaseManager):
def getLastIDs(self, all=True):
tid, _, _, oid = self.db.getLastIDs(all)
return (util.p64(max(tid, self.zodb_ltid)), None, None,
util.p64(max(oid, self.zodb_loid)))
return (max(tid, util.p64(self.zodb_ltid)), None, None,
max(oid, util.p64(self.zodb_loid)))
def objectPresent(self, oid, tid, all=True):
r = self.db.objectPresent(oid, tid, all)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment