1.1 --- a/tests/test_handle.py Tue May 23 22:15:05 2017 +0200
1.2 +++ b/tests/test_handle.py Wed May 24 15:41:14 2017 +0200
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 A handler to help with testing.
1.6
1.7 -Copyright (C) 2014, 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2014, 2015, 2016, 2017 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -151,20 +151,19 @@
1.13 journal = get_journal(store_type, journal_dir)
1.14
1.15 if uid is not None:
1.16 - fragment = store.get_event(user, uid, recurrenceid)
1.17 + obj = store.get_event(user, uid, recurrenceid)
1.18
1.19 # Permit new recurrences by getting the parent object.
1.20
1.21 - if not fragment:
1.22 - fragment = store.get_event(user, uid)
1.23 + if not obj:
1.24 + obj = store.get_event(user, uid)
1.25
1.26 - if not fragment:
1.27 + if not obj:
1.28 print >>sys.stderr, "No such event:", uid, recurrenceid
1.29 sys.exit(1)
1.30 else:
1.31 - fragment = parse_object(sys.stdin, "utf-8")
1.32 + obj = Object(parse_object(sys.stdin, "utf-8"))
1.33
1.34 - obj = Object(fragment)
1.35 handler = TestClient(obj, user, Messenger(), store, None, journal, preferences_dir)
1.36 response = handler.handle_request(action, start, end, recurrenceid)
1.37