1.1 --- a/imip_store.py Tue Feb 09 15:57:23 2016 +0100
1.2 +++ b/imip_store.py Fri Mar 04 18:48:57 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 @@ -581,9 +581,9 @@
1.13 return []
1.14 else:
1.15 return 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 - def get_freebusy_for_other(self, user, other, get_table=None):
1.20 + def get_freebusy_for_other(self, user, other):
1.21
1.22 "For the given 'user', get free/busy details for the 'other' user."
1.23
1.24 @@ -592,9 +592,9 @@
1.25 return []
1.26 else:
1.27 return map(lambda t: FreeBusyPeriod(*t),
1.28 - (get_table or self._get_table_atomic)(user, filename, [(4, None)]))
1.29 + self._get_table_atomic(user, filename, [(4, None)]))
1.30
1.31 - def set_freebusy(self, user, freebusy, name=None, set_table=None):
1.32 + def set_freebusy(self, user, freebusy, name=None):
1.33
1.34 "For the given 'user', set 'freebusy' details."
1.35
1.36 @@ -602,11 +602,11 @@
1.37 if not filename:
1.38 return False
1.39
1.40 - (set_table or self._set_table_atomic)(user, filename,
1.41 + self._set_table_atomic(user, filename,
1.42 map(lambda fb: fb.as_tuple(strings_only=True), freebusy))
1.43 return True
1.44
1.45 - def set_freebusy_for_other(self, user, freebusy, other, set_table=None):
1.46 + def set_freebusy_for_other(self, user, freebusy, other):
1.47
1.48 "For the given 'user', set 'freebusy' details for the 'other' user."
1.49
1.50 @@ -614,7 +614,7 @@
1.51 if not filename:
1.52 return False
1.53
1.54 - (set_table or self._set_table_atomic)(user, filename,
1.55 + self._set_table_atomic(user, filename,
1.56 map(lambda fb: fb.as_tuple(strings_only=True), freebusy))
1.57 return True
1.58
1.59 @@ -1006,7 +1006,7 @@
1.60
1.61 # Free/busy period access for users within quota groups.
1.62
1.63 - def get_freebusy(self, quota, user, get_table=None):
1.64 + def get_freebusy(self, quota, user):
1.65
1.66 "Get free/busy details for the given 'quota' and 'user'."
1.67
1.68 @@ -1015,9 +1015,9 @@
1.69 return []
1.70
1.71 return map(lambda t: FreeBusyPeriod(*t),
1.72 - (get_table or self._get_table_atomic)(quota, filename, [(4, None)]))
1.73 + self._get_table_atomic(quota, filename, [(4, None)]))
1.74
1.75 - def set_freebusy(self, quota, user, freebusy, set_table=None):
1.76 + def set_freebusy(self, quota, user, freebusy):
1.77
1.78 "For the given 'quota' and 'user', set 'freebusy' details."
1.79
1.80 @@ -1025,7 +1025,7 @@
1.81 if not filename:
1.82 return False
1.83
1.84 - (set_table or self._set_table_atomic)(quota, filename,
1.85 + self._set_table_atomic(quota, filename,
1.86 map(lambda fb: fb.as_tuple(strings_only=True), freebusy))
1.87 return True
1.88