# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1457114806 -3600
# Node ID 2175787d18961ddd6092058ee02eac1cee39c6bd
# Parent  67369fd525dbb1ff765818054e374e688278c29d# Parent  462c557ca50a3e313fdef18ba819209979ff0a20
Merged changes from the default branch.

diff -r 67369fd525db -r 2175787d1896 imip_store.py
--- a/imip_store.py	Thu Mar 03 23:20:47 2016 +0100
+++ b/imip_store.py	Fri Mar 04 19:06:46 2016 +0100
@@ -572,7 +572,7 @@
 
     # Free/busy period access.
 
-    def get_freebusy(self, user, name=None, get_table=None):
+    def get_freebusy(self, user, name=None):
 
         "Get free/busy details for the given 'user'."
 
@@ -582,11 +582,11 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                (get_table or self._get_table_atomic)(user, filename, [(4, None)]))
+                self._get_table_atomic(user, filename, [(4, None)]))
 
         return FreeBusyCollection(periods)
 
-    def get_freebusy_for_other(self, user, other, get_table=None):
+    def get_freebusy_for_other(self, user, other):
 
         "For the given 'user', get free/busy details for the 'other' user."
 
@@ -596,11 +596,11 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                (get_table or self._get_table_atomic)(user, filename, [(4, None)]))
+                self._get_table_atomic(user, filename, [(4, None)]))
 
         return FreeBusyCollection(periods)
 
-    def set_freebusy(self, user, freebusy, name=None, set_table=None):
+    def set_freebusy(self, user, freebusy, name=None):
 
         "For the given 'user', set 'freebusy' details."
 
@@ -608,11 +608,11 @@
         if not filename:
             return False
 
-        (set_table or self._set_table_atomic)(user, filename,
+        self._set_table_atomic(user, filename,
             map(lambda fb: fb.as_tuple(strings_only=True), freebusy.periods))
         return True
 
-    def set_freebusy_for_other(self, user, freebusy, other, set_table=None):
+    def set_freebusy_for_other(self, user, freebusy, other):
 
         "For the given 'user', set 'freebusy' details for the 'other' user."
 
@@ -620,7 +620,7 @@
         if not filename:
             return False
 
-        (set_table or self._set_table_atomic)(user, filename,
+        self._set_table_atomic(user, filename,
             map(lambda fb: fb.as_tuple(strings_only=True), freebusy.periods))
         return True
 
@@ -1012,7 +1012,7 @@
 
     # Free/busy period access for users within quota groups.
 
-    def get_freebusy(self, quota, user, get_table=None):
+    def get_freebusy(self, quota, user):
 
         "Get free/busy details for the given 'quota' and 'user'."
 
@@ -1022,11 +1022,11 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                (get_table or self._get_table_atomic)(quota, filename, [(4, None)]))
+                self._get_table_atomic(quota, filename, [(4, None)]))
 
         return FreeBusyCollection(periods)
 
-    def set_freebusy(self, quota, user, freebusy, set_table=None):
+    def set_freebusy(self, quota, user, freebusy):
 
         "For the given 'quota' and 'user', set 'freebusy' details."
 
@@ -1034,7 +1034,7 @@
         if not filename:
             return False
 
-        (set_table or self._set_table_atomic)(quota, filename,
+        self._set_table_atomic(quota, filename,
             map(lambda fb: fb.as_tuple(strings_only=True), freebusy.periods))
         return True