1.1 --- a/imip_store.py Thu Mar 03 23:20:47 2016 +0100
1.2 +++ b/imip_store.py Fri Mar 04 19:06:46 2016 +0100
1.3 @@ -572,7 +572,7 @@
1.4
1.5 # Free/busy period access.
1.6
1.7 - def get_freebusy(self, user, name=None, get_table=None):
1.8 + def get_freebusy(self, user, name=None):
1.9
1.10 "Get free/busy details for the given 'user'."
1.11
1.12 @@ -582,11 +582,11 @@
1.13 periods = []
1.14 else:
1.15 periods = map(lambda t: FreeBusyPeriod(*t),
1.16 - (get_table or self._get_table_atomic)(user, filename, [(4, None)]))
1.17 + self._get_table_atomic(user, filename, [(4, None)]))
1.18
1.19 return FreeBusyCollection(periods)
1.20
1.21 - def get_freebusy_for_other(self, user, other, get_table=None):
1.22 + def get_freebusy_for_other(self, user, other):
1.23
1.24 "For the given 'user', get free/busy details for the 'other' user."
1.25
1.26 @@ -596,11 +596,11 @@
1.27 periods = []
1.28 else:
1.29 periods = map(lambda t: FreeBusyPeriod(*t),
1.30 - (get_table or self._get_table_atomic)(user, filename, [(4, None)]))
1.31 + self._get_table_atomic(user, filename, [(4, None)]))
1.32
1.33 return FreeBusyCollection(periods)
1.34
1.35 - def set_freebusy(self, user, freebusy, name=None, set_table=None):
1.36 + def set_freebusy(self, user, freebusy, name=None):
1.37
1.38 "For the given 'user', set 'freebusy' details."
1.39
1.40 @@ -608,11 +608,11 @@
1.41 if not filename:
1.42 return False
1.43
1.44 - (set_table or self._set_table_atomic)(user, filename,
1.45 + self._set_table_atomic(user, filename,
1.46 map(lambda fb: fb.as_tuple(strings_only=True), freebusy.periods))
1.47 return True
1.48
1.49 - def set_freebusy_for_other(self, user, freebusy, other, set_table=None):
1.50 + def set_freebusy_for_other(self, user, freebusy, other):
1.51
1.52 "For the given 'user', set 'freebusy' details for the 'other' user."
1.53
1.54 @@ -620,7 +620,7 @@
1.55 if not filename:
1.56 return False
1.57
1.58 - (set_table or self._set_table_atomic)(user, filename,
1.59 + self._set_table_atomic(user, filename,
1.60 map(lambda fb: fb.as_tuple(strings_only=True), freebusy.periods))
1.61 return True
1.62
1.63 @@ -1012,7 +1012,7 @@
1.64
1.65 # Free/busy period access for users within quota groups.
1.66
1.67 - def get_freebusy(self, quota, user, get_table=None):
1.68 + def get_freebusy(self, quota, user):
1.69
1.70 "Get free/busy details for the given 'quota' and 'user'."
1.71
1.72 @@ -1022,11 +1022,11 @@
1.73 periods = []
1.74 else:
1.75 periods = map(lambda t: FreeBusyPeriod(*t),
1.76 - (get_table or self._get_table_atomic)(quota, filename, [(4, None)]))
1.77 + self._get_table_atomic(quota, filename, [(4, None)]))
1.78
1.79 return FreeBusyCollection(periods)
1.80
1.81 - def set_freebusy(self, quota, user, freebusy, set_table=None):
1.82 + def set_freebusy(self, quota, user, freebusy):
1.83
1.84 "For the given 'quota' and 'user', set 'freebusy' details."
1.85
1.86 @@ -1034,7 +1034,7 @@
1.87 if not filename:
1.88 return False
1.89
1.90 - (set_table or self._set_table_atomic)(quota, filename,
1.91 + self._set_table_atomic(quota, filename,
1.92 map(lambda fb: fb.as_tuple(strings_only=True), freebusy.periods))
1.93 return True
1.94