# HG changeset patch # User Paul Boddie # Date 1512338213 -3600 # Node ID 8e216b3055d7559113b696ac3cb16406173c4363 # Parent 864bd7461d3a3c8ccce0a9184974c0225c35dcee Eliminated duplicate code by introducing a selector preparation function. diff -r 864bd7461d3a -r 8e216b3055d7 tests/qualifiers.py --- a/tests/qualifiers.py Sun Dec 03 22:45:22 2017 +0100 +++ b/tests/qualifiers.py Sun Dec 03 22:56:53 2017 +0100 @@ -26,21 +26,24 @@ print x print +def select(dt, qualifiers): + sel = make_selectors(qualifiers) + show(sel) + l = get_datetime_structure(dt) + show(l) + csel = combine_datetime_with_selectors(dt, sel) + show(csel) + + s = get_selector(dt, sel) + csel = get_selectors_from_selector(s) + show(csel) + return s + qualifiers = [ ("YEARLY", {"interval" : 1}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 11, 2) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2003, 12, 24)) print len(l) == 7, 7, len(l) @@ -55,18 +58,8 @@ ("BYHOUR", {"values" : [8, 9]}), ("BYMINUTE", {"values" : [30]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 1, 5, 8, 30, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2003, 12, 24, 0, 0, 0)) print len(l) == 34, 34, len(l) @@ -78,18 +71,8 @@ ("DAILY", {"interval" : 1}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24)) print len(l) == 10, 10, len(l) @@ -100,18 +83,8 @@ qualifiers = [ ("DAILY", {"interval" : 1}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 113, 113, len(l) @@ -122,18 +95,8 @@ qualifiers = [ ("DAILY", {"interval" : 2}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 57, 57, len(l) @@ -144,18 +107,8 @@ qualifiers = [ ("WEEKLY", {"interval" : 1}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 17, 17, len(l) @@ -167,18 +120,8 @@ ("DAILY", {"interval" : 10}), ("COUNT", {"values" : [5]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 5, 5, len(l) @@ -191,18 +134,8 @@ ("BYMONTH", {"values" : [1]}), ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None), (6, None), (7, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1998, 1, 1, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2000, 1, 31, 14, 0, 0)) print len(l) == 93, 93, len(l) @@ -214,18 +147,8 @@ ("DAILY", {"interval" : 1}), ("BYMONTH", {"values" : [1]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1998, 1, 1, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2000, 1, 31, 14, 0, 0)) print len(l) == 93, 93, len(l) @@ -237,18 +160,8 @@ ("WEEKLY", {"interval" : 1}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -259,18 +172,8 @@ qualifiers = [ ("WEEKLY", {"interval" : 1}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 17, 17, len(l) @@ -281,18 +184,8 @@ qualifiers = [ ("WEEKLY", {"interval" : 1}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 17, 17, len(l) @@ -303,18 +196,8 @@ qualifiers = [ ("WEEKLY", {"interval" : 2}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 2, 20, 0, 0, 0)) print len(l) == 13, 13, len(l) @@ -326,18 +209,8 @@ ("WEEKLY", {"interval" : 1}), ("BYDAY", {"values" : [(2, None), (4, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 10, 7, 9, 0, 0)) print len(l) == 10, 10, len(l) @@ -350,18 +223,8 @@ ("BYDAY", {"values" : [(2, None), (4, None)]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -373,18 +236,8 @@ ("WEEKLY", {"interval" : 2}), ("BYDAY", {"values" : [(1, None), (3, None), (5, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 1, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 25, 25, len(l) @@ -397,18 +250,8 @@ ("BYDAY", {"values" : [(2, None), (4, None)]}), ("COUNT", {"values" : [8]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 8, 8, len(l) @@ -421,18 +264,8 @@ ("BYDAY", {"values" : [(5, 1)]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 5, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -444,18 +277,8 @@ ("MONTHLY", {"interval" : 1}), ("BYDAY", {"values" : [(5, 1)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 5, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 4, 4, len(l) @@ -468,18 +291,8 @@ ("BYDAY", {"values" : [(7, 1), (7, -1)]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 7, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -492,18 +305,8 @@ ("BYDAY", {"values" : [(1, -2)]}), ("COUNT", {"values" : [6]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 22, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 6, 6, len(l) @@ -516,18 +319,8 @@ ("BYMONTHDAY", {"values" : [-3]}), ("COUNT", {"values" : [6]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 28, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 6, 6, len(l) @@ -540,18 +333,8 @@ ("BYMONTHDAY", {"values" : [15, 2]}), # test ordering ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -564,18 +347,8 @@ ("BYMONTHDAY", {"values" : [1, -1]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 30, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -588,18 +361,8 @@ ("BYMONTHDAY", {"values" : [10, 11, 12, 13, 14, 15]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 10, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -611,18 +374,8 @@ ("MONTHLY", {"interval" : 2}), ("BYDAY", {"values" : [(2, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 4, 1, 0, 0, 0)) print len(l) == 18, 18, len(l) @@ -635,18 +388,8 @@ ("BYMONTH", {"values" : [6, 7]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 6, 10, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2001, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -659,18 +402,8 @@ ("BYMONTH", {"values" : [1, 2, 3]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 3, 10, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2003, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -683,18 +416,8 @@ ("BYYEARDAY", {"values" : [1, 100, 200]}), ("COUNT", {"values" : [10]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 1, 1, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2006, 2, 1, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -706,18 +429,8 @@ ("YEARLY", {"interval" : 1}), ("BYDAY", {"values" : [(1, 20)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 5, 19, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -731,18 +444,8 @@ ("BYWEEKNO", {"values" : [20]}), ("BYDAY", {"values" : [(1, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 5, 12, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -756,18 +459,8 @@ ("BYMONTH", {"values" : [3]}), ("BYDAY", {"values" : [(4, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 3, 13, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 11, 11, len(l) @@ -780,18 +473,8 @@ ("BYMONTH", {"values" : [6, 7, 8]}), ("BYDAY", {"values" : [(4, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 6, 5, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 39, 39, len(l) @@ -804,18 +487,8 @@ ("BYMONTHDAY", {"values" : [13]}), ("BYDAY", {"values" : [(5, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 2, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2000, 12, 24, 0, 0, 0)) print len(l) == 6, 6, len(l) @@ -828,18 +501,8 @@ ("BYMONTHDAY", {"values" : [7, 8, 9, 10, 11, 12, 13]}), ("BYDAY", {"values" : [(6, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 13, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 6, 30, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -853,18 +516,8 @@ ("BYMONTHDAY", {"values" : [2, 3, 4, 5, 6, 7, 8]}), ("BYDAY", {"values" : [(2, None)]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1996, 11, 5, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2004, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -878,18 +531,8 @@ ("BYSETPOS", {"values" : [3]}), ("COUNT", {"values" : [3]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 4, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -904,18 +547,8 @@ ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None)]}), ("BYSETPOS", {"values" : [-2]}) ] - -sel = make_selectors(qualifiers) -show(sel) dt = (1997, 9, 29, 9, 0, 0) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (1998, 4, 1, 0, 0, 0)) print len(l) == 7, 7, len(l) @@ -924,18 +557,8 @@ print qualifiers = get_qualifiers(["BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"]) - -sel = make_selectors(qualifiers) -show(sel) dt = (2017, 6, 13) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2019, 1, 1)) print len(l) == 37, 37, len(l) @@ -943,18 +566,8 @@ print l[-1] == (2018, 12, 5, 12), (2018, 12, 5, 12), l[-1] qualifiers = get_qualifiers(["FREQ=DAILY", "BYMONTH=1"]) - -sel = make_selectors(qualifiers) -show(sel) dt = (2017, 6, 13) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2019, 1, 1)) print len(l) == 32, 32, len(l) @@ -962,18 +575,8 @@ print l[-1] == (2018, 1, 31), (2018, 1, 31), l[-1] qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYDAY=WE,1FR,2MO,2FR"]) - -sel = make_selectors(qualifiers) -show(sel) dt = (2017, 10, 15) -l = get_datetime_structure(dt) -show(l) -csel = combine_datetime_with_selectors(dt, sel) -show(csel) - -s = get_selector(dt, sel) -csel = get_selectors_from_selector(s) -show(csel) +s = select(dt, qualifiers) l = s.materialise(dt, (2018, 1, 1)) print len(l) == 18, 18, len(l)