1.1 --- a/imiptools/period.py Sat Dec 16 22:01:04 2017 +0100
1.2 +++ b/imiptools/period.py Sat Dec 16 22:44:26 2017 +0100
1.3 @@ -422,11 +422,11 @@
1.4
1.5 "A collection of rule periods."
1.6
1.7 - def __init__(self, selector, until, main_period, tzid, end, inclusive=False):
1.8 + def __init__(self, selector, main_period, tzid, end, inclusive=False):
1.9
1.10 """
1.11 - Initialise a period collection for the given 'selectors', limited by any
1.12 - 'until' datetime, employing the 'main_period' and 'tzid'.
1.13 + Initialise a period collection for the given 'selectors', employing the
1.14 + 'main_period' and 'tzid'.
1.15
1.16 The specified 'end' datetime indicates the end of the window for which
1.17 periods shall be computed.
1.18 @@ -438,18 +438,8 @@
1.19 self.selector = selector
1.20 self.main_period = main_period
1.21 self.tzid = tzid
1.22 -
1.23 - # Any UNTIL qualifier changes the nature of the end of the collection.
1.24 -
1.25 - if until:
1.26 - if to_datetime(end, tzid) < to_datetime(until, tzid):
1.27 - self.end = end
1.28 - else:
1.29 - self.end = until
1.30 - self.inclusive = True
1.31 - else:
1.32 - self.end = end
1.33 - self.inclusive = inclusive
1.34 + self.end = end
1.35 + self.inclusive = inclusive
1.36
1.37 def __iter__(self):
1.38