# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1505240888 -7200
# Node ID 694fd9694bdf77f5824c713d15e6ac260996033f
# Parent  17071fe5c99e5e48bd663130edf8b478a69397ec# Parent  333740ca50b667e726056f9c8137635ec1f5ad6d
Merged changes from concurrent branch.

diff -r 17071fe5c99e -r 694fd9694bdf imipweb/data.py
--- a/imipweb/data.py	Tue Sep 12 18:34:49 2017 +0200
+++ b/imipweb/data.py	Tue Sep 12 20:28:08 2017 +0200
@@ -86,7 +86,7 @@
             isinstance(self.start, datetime) or isinstance(self.end, datetime),
             self.tzid,
             self.origin,
-            self.replaced
+            self.replaced and True or False
             )
 
     def get_form_date(self, dt, attr=None):
@@ -119,6 +119,13 @@
     def __repr__(self):
         return "FormPeriod%r" % (self.as_tuple(),)
 
+    def __cmp__(self, other):
+        result = RecurringPeriod.__cmp__(self, other)
+        if result:
+            return result
+        other = form_period_from_period(other)
+        return cmp(self.replaced, other.replaced)
+
     def as_event_period(self, index=None):
 
         """