# HG changeset patch # User Paul Boddie # Date 1457136259 -3600 # Node ID b0c1acfc40c776562b4a5a1285d94435797f3f90 # Parent 462c557ca50a3e313fdef18ba819209979ff0a20 Removed overriding defaults when retrieving periods from the store, handling default attribute values in the period abstraction itself. diff -r 462c557ca50a -r b0c1acfc40c7 imip_store.py --- a/imip_store.py Fri Mar 04 18:48:57 2016 +0100 +++ b/imip_store.py Sat Mar 05 01:04:19 2016 +0100 @@ -581,7 +581,7 @@ return [] else: return map(lambda t: FreeBusyPeriod(*t), - self._get_table_atomic(user, filename, [(4, None)])) + self._get_table_atomic(user, filename)) def get_freebusy_for_other(self, user, other): @@ -592,7 +592,7 @@ return [] else: return map(lambda t: FreeBusyPeriod(*t), - self._get_table_atomic(user, filename, [(4, None)])) + self._get_table_atomic(user, filename)) def set_freebusy(self, user, freebusy, name=None): @@ -1015,7 +1015,7 @@ return [] return map(lambda t: FreeBusyPeriod(*t), - self._get_table_atomic(quota, filename, [(4, None)])) + self._get_table_atomic(quota, filename)) def set_freebusy(self, quota, user, freebusy): @@ -1043,7 +1043,7 @@ return [] return map(lambda t: FreeBusyPeriod(*t), - self._get_table_atomic(quota, filename, [(4, None)])) + self._get_table_atomic(quota, filename)) def set_entries(self, quota, group, entries): diff -r 462c557ca50a -r b0c1acfc40c7 imiptools/period.py --- a/imiptools/period.py Fri Mar 04 18:48:57 2016 +0100 +++ b/imiptools/period.py Sat Mar 05 01:04:19 2016 +0100 @@ -350,11 +350,11 @@ PeriodBase.__init__(self, start, end) self.uid = uid - self.transp = transp - self.recurrenceid = recurrenceid - self.summary = summary - self.organiser = organiser - self.expires = expires + self.transp = transp or None + self.recurrenceid = recurrenceid or None + self.summary = summary or None + self.organiser = organiser or None + self.expires = expires or None def as_tuple(self, strings_only=False):