# HG changeset patch # User Paul Boddie # Date 1512338472 -3600 # Node ID 92389b7220038865566f8ccf08e49a08332bf083 # Parent 4d3e6b13737fd80b02bfc5ada1a208aad9145497 Fixed UNTIL acquisition from rule parameters. diff -r 4d3e6b13737f -r 92389b722003 imiptools/data.py --- a/imiptools/data.py Sun Dec 03 22:56:53 2017 +0100 +++ b/imiptools/data.py Sun Dec 03 23:01:12 2017 +0100 @@ -1237,9 +1237,11 @@ return iter([main_period]) parameters = get_parameters(rrule) - until = parameters and parameters.has_key("UNTIL") or None + until = parameters and parameters.get("UNTIL") or None until = until and to_timezone(get_datetime(until), tzid) + # Obtain the periods generated by the rule. + rule_periods = get_periods_using_selector(selector, until, main_period, tzid, start, end, inclusive)