# HG changeset patch # User Paul Boddie # Date 1512317597 -3600 # Node ID d9d08eecc3e262a3ca9caa46a011f363a4370786 # Parent 6ec0ae1d58ee328c3599148e7fab0c2621007684 Fixed selector preparation. diff -r 6ec0ae1d58ee -r d9d08eecc3e2 tests/internal/qualifiers.py --- a/tests/internal/qualifiers.py Sun Dec 03 01:29:03 2017 +0100 +++ b/tests/internal/qualifiers.py Sun Dec 03 17:13:17 2017 +0100 @@ -35,10 +35,10 @@ dt = (1997, 11, 2) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2003, 12, 24)) print len(l) == 7, 7, len(l) @@ -59,10 +59,10 @@ dt = (1997, 1, 5, 8, 30, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2003, 12, 24, 0, 0, 0)) print len(l) == 34, 34, len(l) @@ -80,10 +80,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24)) print len(l) == 10, 10, len(l) @@ -100,10 +100,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 113, 113, len(l) @@ -120,10 +120,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 57, 57, len(l) @@ -140,10 +140,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 17, 17, len(l) @@ -161,10 +161,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 5, 5, len(l) @@ -183,10 +183,10 @@ dt = (1998, 1, 1, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2000, 1, 31, 14, 0, 0)) print len(l) == 93, 93, len(l) @@ -204,10 +204,10 @@ dt = (1998, 1, 1, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2000, 1, 31, 14, 0, 0)) print len(l) == 93, 93, len(l) @@ -225,10 +225,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -245,10 +245,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 17, 17, len(l) @@ -265,10 +265,10 @@ dt = (1997, 9, 2) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 17, 17, len(l) @@ -285,10 +285,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 2, 20, 0, 0, 0)) print len(l) == 13, 13, len(l) @@ -306,10 +306,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 10, 7, 9, 0, 0)) print len(l) == 10, 10, len(l) @@ -328,10 +328,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -349,10 +349,10 @@ dt = (1997, 9, 1, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 25, 25, len(l) @@ -371,10 +371,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 8, 8, len(l) @@ -393,10 +393,10 @@ dt = (1997, 9, 5, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -414,10 +414,10 @@ dt = (1997, 9, 5, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 4, 4, len(l) @@ -436,10 +436,10 @@ dt = (1997, 9, 7, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -458,10 +458,10 @@ dt = (1997, 9, 22, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 6, 6, len(l) @@ -480,10 +480,10 @@ dt = (1997, 9, 28, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 6, 6, len(l) @@ -502,10 +502,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -524,10 +524,10 @@ dt = (1997, 9, 30, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -546,10 +546,10 @@ dt = (1997, 9, 10, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -567,10 +567,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 4, 1, 0, 0, 0)) print len(l) == 18, 18, len(l) @@ -589,10 +589,10 @@ dt = (1997, 6, 10, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2001, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -611,10 +611,10 @@ dt = (1997, 3, 10, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2003, 12, 24, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -633,10 +633,10 @@ dt = (1997, 1, 1, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2006, 2, 1, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -654,10 +654,10 @@ dt = (1997, 5, 19, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -677,10 +677,10 @@ dt = (1997, 5, 12, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -700,10 +700,10 @@ dt = (1997, 3, 13, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 11, 11, len(l) @@ -722,10 +722,10 @@ dt = (1997, 6, 5, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1999, 12, 24, 0, 0, 0)) print len(l) == 39, 39, len(l) @@ -744,10 +744,10 @@ dt = (1997, 9, 2, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2000, 12, 24, 0, 0, 0)) print len(l) == 6, 6, len(l) @@ -766,10 +766,10 @@ dt = (1997, 9, 13, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 6, 30, 0, 0, 0)) print len(l) == 10, 10, len(l) @@ -789,10 +789,10 @@ dt = (1996, 11, 5, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2004, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -812,10 +812,10 @@ dt = (1997, 9, 4, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1997, 12, 24, 0, 0, 0)) print len(l) == 3, 3, len(l) @@ -836,10 +836,10 @@ dt = (1997, 9, 29, 9, 0, 0) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (1998, 4, 1, 0, 0, 0)) print len(l) == 7, 7, len(l) @@ -854,10 +854,10 @@ dt = (2017, 6, 13) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2019, 1, 1)) print len(l) == 37, 37, len(l) @@ -871,10 +871,10 @@ dt = (2017, 6, 13) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2019, 1, 1)) print len(l) == 32, 32, len(l) @@ -888,10 +888,10 @@ dt = (2017, 10, 15) l = get_datetime_structure(dt) show(l) -sel = combine_datetime_with_selectors(dt, sel) +csel = combine_datetime_with_selectors(dt, sel) +show(csel) s = get_selector(dt, sel) -show(sel) l = s.materialise(dt, (2018, 1, 1)) print len(l) == 18, 18, len(l)