1.1 --- a/tools/copy_store.py Tue May 23 22:15:05 2017 +0200
1.2 +++ b/tools/copy_store.py Wed May 24 15:41:14 2017 +0200
1.3 @@ -59,9 +59,9 @@
1.4 # Get event, recurrence information.
1.5
1.6 for uid, recurrenceid in from_store.get_all_events(user, dirname=dirname):
1.7 - d = from_store.get_event(user, uid, recurrenceid, dirname=dirname)
1.8 - if d:
1.9 - to_store.set_event(user, uid, recurrenceid, Object(d).to_node())
1.10 + obj = from_store.get_event(user, uid, recurrenceid, dirname=dirname)
1.11 + if obj:
1.12 + to_store.set_event(user, uid, recurrenceid, obj.to_node())
1.13 if dirname == "cancellations":
1.14 to_store.cancel_event(user, uid, recurrenceid)
1.15 else:
1.16 @@ -72,9 +72,9 @@
1.17
1.18 if dirname is None:
1.19 for other in from_store.get_counters(user, uid, recurrenceid):
1.20 - d = from_store.get_counter(user, other, uid, recurrenceid)
1.21 - if d:
1.22 - to_store.set_counter(user, other, Object(d).to_node(), uid, recurrenceid)
1.23 + obj = from_store.get_counter(user, other, uid, recurrenceid)
1.24 + if obj:
1.25 + to_store.set_counter(user, other, obj.to_node(), uid, recurrenceid)
1.26 else:
1.27 print >>sys.stderr, "Counter-proposal for %s with UID %s and RECURRENCE-ID %s not found in %s" % (
1.28 (user, uid, recurrenceid or "null", dirname or "active events"))