1.1 --- a/imiptools/handlers/scheduling/quota.py Tue May 23 22:15:05 2017 +0200
1.2 +++ b/imiptools/handlers/scheduling/quota.py Wed May 24 15:41:14 2017 +0200
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 Quota-related scheduling functionality.
1.6
1.7 -Copyright (C) 2016 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 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 @@ -20,7 +20,7 @@
1.13 """
1.14
1.15 from imiptools.dates import get_duration, to_utc_datetime
1.16 -from imiptools.data import get_uri, uri_dict, Object
1.17 +from imiptools.data import get_uri, uri_dict
1.18 from imiptools.handlers.scheduling.common import get_scheduling_conflicts, \
1.19 standard_responses
1.20 from imiptools.period import Endless
1.21 @@ -103,8 +103,7 @@
1.22 # Where an existing version of the object exists, merge the recipient's
1.23 # attendance information.
1.24
1.25 - fragment = journal.get_event(quota, handler.uid, handler.recurrenceid)
1.26 - obj = fragment and Object(fragment)
1.27 + obj = journal.get_event(quota, handler.uid, handler.recurrenceid)
1.28 if not obj:
1.29 obj = handler.obj
1.30
1.31 @@ -128,8 +127,7 @@
1.32 # Where an existing version of the object exists, remove the recipient's
1.33 # attendance information.
1.34
1.35 - fragment = journal.get_event(quota, handler.uid, handler.recurrenceid)
1.36 - obj = fragment and Object(fragment)
1.37 + obj = journal.get_event(quota, handler.uid, handler.recurrenceid)
1.38 if not obj:
1.39 return
1.40