# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1457217947 -3600
# Node ID 3beb0a1b1148da06b964befeea2e7b8d5f7eebd1
# Parent  2175787d18961ddd6092058ee02eac1cee39c6bd# Parent  b0c1acfc40c776562b4a5a1285d94435797f3f90
Merged changes from the default branch.

diff -r 2175787d1896 -r 3beb0a1b1148 imip_store.py
--- a/imip_store.py	Fri Mar 04 19:06:46 2016 +0100
+++ b/imip_store.py	Sat Mar 05 23:45:47 2016 +0100
@@ -582,7 +582,7 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                self._get_table_atomic(user, filename, [(4, None)]))
+                self._get_table_atomic(user, filename))
 
         return FreeBusyCollection(periods)
 
@@ -596,7 +596,7 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                self._get_table_atomic(user, filename, [(4, None)]))
+                self._get_table_atomic(user, filename))
 
         return FreeBusyCollection(periods)
 
@@ -1022,7 +1022,7 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                self._get_table_atomic(quota, filename, [(4, None)]))
+                self._get_table_atomic(quota, filename))
 
         return FreeBusyCollection(periods)
 
@@ -1053,7 +1053,7 @@
             periods = []
         else:
             periods = map(lambda t: FreeBusyPeriod(*t),
-                self._get_table_atomic(quota, filename, [(4, None)]))
+                self._get_table_atomic(quota, filename))
 
         return FreeBusyCollection(periods)
 
diff -r 2175787d1896 -r 3beb0a1b1148 imiptools/period.py
--- a/imiptools/period.py	Fri Mar 04 19:06:46 2016 +0100
+++ b/imiptools/period.py	Sat Mar 05 23:45:47 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):