1.1 --- a/imiptools/period.py Tue Mar 31 18:25:49 2015 +0200
1.2 +++ b/imiptools/period.py Tue Mar 31 19:06:47 2015 +0200
1.3 @@ -64,9 +64,6 @@
1.4 def as_tuple(self):
1.5 return self.start, self.end, self.uid, self.transp, self.recurrenceid, self.summary, self.organiser
1.6
1.7 - def __hash__(self):
1.8 - return hash((self.start, self.end, self.uid))
1.9 -
1.10 def __cmp__(self, other):
1.11 if isinstance(other, FreeBusyPeriod):
1.12 return cmp((self.start, self.end, self.uid), (other.start, other.end, other.uid))
1.13 @@ -91,7 +88,7 @@
1.14 """
1.15
1.16 for conflict in have_conflict(freebusy, periods, True):
1.17 - if conflict.uid != uid and conflict.recurrenceid != recurrenceid:
1.18 + if conflict.uid != uid or conflict.recurrenceid != recurrenceid:
1.19 return False
1.20
1.21 return True