1.1 --- a/tests/qualifiers.py Sun Dec 03 01:16:20 2017 +0100
1.2 +++ b/tests/qualifiers.py Sun Dec 03 01:16:48 2017 +0100
1.3 @@ -30,15 +30,16 @@
1.4 ("YEARLY", {"interval" : 1})
1.5 ]
1.6
1.7 -l = order_qualifiers(qualifiers)
1.8 -show(l)
1.9 +sel = make_selectors(qualifiers)
1.10 +show(sel)
1.11 dt = (1997, 11, 2)
1.12 l = get_datetime_structure(dt)
1.13 show(l)
1.14 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.15 -show(l)
1.16 +sel = combine_datetime_with_selectors(dt, sel)
1.17
1.18 -s = get_selector(dt, qualifiers)
1.19 +s = get_selector(dt, sel)
1.20 +show(sel)
1.21 +
1.22 l = s.materialise(dt, (2003, 12, 24))
1.23 print len(l) == 7, 7, len(l)
1.24 print l[0] == (1997, 11, 2), (1997, 11, 2), l[0]
1.25 @@ -48,24 +49,25 @@
1.26 qualifiers = [
1.27 ("YEARLY", {"interval" : 2}),
1.28 ("BYMONTH", {"values" : [1]}),
1.29 - ("BYDAY", {"values" : [(6, None)]}),
1.30 + ("BYDAY", {"values" : [(7, None)]}),
1.31 ("BYHOUR", {"values" : [8, 9]}),
1.32 ("BYMINUTE", {"values" : [30]})
1.33 ]
1.34
1.35 -l = order_qualifiers(qualifiers)
1.36 -show(l)
1.37 +sel = make_selectors(qualifiers)
1.38 +show(sel)
1.39 dt = (1997, 1, 5, 8, 30, 0)
1.40 l = get_datetime_structure(dt)
1.41 show(l)
1.42 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.43 -show(l)
1.44 +sel = combine_datetime_with_selectors(dt, sel)
1.45 +
1.46 +s = get_selector(dt, sel)
1.47 +show(sel)
1.48
1.49 -s = get_selector(dt, qualifiers)
1.50 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.51 -print len(l) == 32, 32, len(l)
1.52 -print l[0] == (1997, 1, 11, 8, 30, 0), (1997, 1, 11, 8, 30, 0), l[0]
1.53 -print l[-1] == (2003, 1, 25, 9, 30, 0), (2003, 1, 25, 9, 30, 0), l[-1]
1.54 +print len(l) == 34, 34, len(l)
1.55 +print l[0] == (1997, 1, 5, 8, 30, 0), (1997, 1, 5, 8, 30, 0), l[0]
1.56 +print l[-1] == (2003, 1, 26, 9, 30, 0), (2003, 1, 26, 9, 30, 0), l[-1]
1.57 print
1.58
1.59 qualifiers = [
1.60 @@ -73,15 +75,16 @@
1.61 ("COUNT", {"values" : [10]})
1.62 ]
1.63
1.64 -l = order_qualifiers(qualifiers)
1.65 -show(l)
1.66 +sel = make_selectors(qualifiers)
1.67 +show(sel)
1.68 dt = (1997, 9, 2, 9, 0, 0)
1.69 l = get_datetime_structure(dt)
1.70 show(l)
1.71 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.72 -show(l)
1.73 +sel = combine_datetime_with_selectors(dt, sel)
1.74
1.75 -s = get_selector(dt, qualifiers)
1.76 +s = get_selector(dt, sel)
1.77 +show(sel)
1.78 +
1.79 l = s.materialise(dt, (1997, 12, 24))
1.80 print len(l) == 10, 10, len(l)
1.81 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.82 @@ -92,15 +95,16 @@
1.83 ("DAILY", {"interval" : 1})
1.84 ]
1.85
1.86 -l = order_qualifiers(qualifiers)
1.87 -show(l)
1.88 +sel = make_selectors(qualifiers)
1.89 +show(sel)
1.90 dt = (1997, 9, 2, 9, 0, 0)
1.91 l = get_datetime_structure(dt)
1.92 show(l)
1.93 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.94 -show(l)
1.95 +sel = combine_datetime_with_selectors(dt, sel)
1.96
1.97 -s = get_selector(dt, qualifiers)
1.98 +s = get_selector(dt, sel)
1.99 +show(sel)
1.100 +
1.101 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.102 print len(l) == 113, 113, len(l)
1.103 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.104 @@ -111,15 +115,16 @@
1.105 ("DAILY", {"interval" : 2})
1.106 ]
1.107
1.108 -l = order_qualifiers(qualifiers)
1.109 -show(l)
1.110 +sel = make_selectors(qualifiers)
1.111 +show(sel)
1.112 dt = (1997, 9, 2, 9, 0, 0)
1.113 l = get_datetime_structure(dt)
1.114 show(l)
1.115 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.116 -show(l)
1.117 +sel = combine_datetime_with_selectors(dt, sel)
1.118
1.119 -s = get_selector(dt, qualifiers)
1.120 +s = get_selector(dt, sel)
1.121 +show(sel)
1.122 +
1.123 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.124 print len(l) == 57, 57, len(l)
1.125 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.126 @@ -130,15 +135,16 @@
1.127 ("WEEKLY", {"interval" : 1})
1.128 ]
1.129
1.130 -l = order_qualifiers(qualifiers)
1.131 -show(l)
1.132 +sel = make_selectors(qualifiers)
1.133 +show(sel)
1.134 dt = (1997, 9, 2, 9, 0, 0)
1.135 l = get_datetime_structure(dt)
1.136 show(l)
1.137 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.138 -show(l)
1.139 +sel = combine_datetime_with_selectors(dt, sel)
1.140
1.141 -s = get_selector(dt, qualifiers)
1.142 +s = get_selector(dt, sel)
1.143 +show(sel)
1.144 +
1.145 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.146 print len(l) == 17, 17, len(l)
1.147 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.148 @@ -150,15 +156,16 @@
1.149 ("COUNT", {"values" : [5]})
1.150 ]
1.151
1.152 -l = order_qualifiers(qualifiers)
1.153 -show(l)
1.154 +sel = make_selectors(qualifiers)
1.155 +show(sel)
1.156 dt = (1997, 9, 2, 9, 0, 0)
1.157 l = get_datetime_structure(dt)
1.158 show(l)
1.159 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.160 -show(l)
1.161 +sel = combine_datetime_with_selectors(dt, sel)
1.162
1.163 -s = get_selector(dt, qualifiers)
1.164 +s = get_selector(dt, sel)
1.165 +show(sel)
1.166 +
1.167 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.168 print len(l) == 5, 5, len(l)
1.169 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.170 @@ -171,15 +178,16 @@
1.171 ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None), (6, None), (7, None)]})
1.172 ]
1.173
1.174 -l = order_qualifiers(qualifiers)
1.175 -show(l)
1.176 +sel = make_selectors(qualifiers)
1.177 +show(sel)
1.178 dt = (1998, 1, 1, 9, 0, 0)
1.179 l = get_datetime_structure(dt)
1.180 show(l)
1.181 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.182 -show(l)
1.183 +sel = combine_datetime_with_selectors(dt, sel)
1.184
1.185 -s = get_selector(dt, qualifiers)
1.186 +s = get_selector(dt, sel)
1.187 +show(sel)
1.188 +
1.189 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.190 print len(l) == 93, 93, len(l)
1.191 print l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]
1.192 @@ -191,15 +199,16 @@
1.193 ("BYMONTH", {"values" : [1]})
1.194 ]
1.195
1.196 -l = order_qualifiers(qualifiers)
1.197 -show(l)
1.198 +sel = make_selectors(qualifiers)
1.199 +show(sel)
1.200 dt = (1998, 1, 1, 9, 0, 0)
1.201 l = get_datetime_structure(dt)
1.202 show(l)
1.203 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.204 -show(l)
1.205 +sel = combine_datetime_with_selectors(dt, sel)
1.206
1.207 -s = get_selector(dt, qualifiers)
1.208 +s = get_selector(dt, sel)
1.209 +show(sel)
1.210 +
1.211 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.212 print len(l) == 93, 93, len(l)
1.213 print l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]
1.214 @@ -211,15 +220,16 @@
1.215 ("COUNT", {"values" : [10]})
1.216 ]
1.217
1.218 -l = order_qualifiers(qualifiers)
1.219 -show(l)
1.220 +sel = make_selectors(qualifiers)
1.221 +show(sel)
1.222 dt = (1997, 9, 2, 9, 0, 0)
1.223 l = get_datetime_structure(dt)
1.224 show(l)
1.225 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.226 -show(l)
1.227 +sel = combine_datetime_with_selectors(dt, sel)
1.228
1.229 -s = get_selector(dt, qualifiers)
1.230 +s = get_selector(dt, sel)
1.231 +show(sel)
1.232 +
1.233 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.234 print len(l) == 10, 10, len(l)
1.235 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.236 @@ -230,15 +240,16 @@
1.237 ("WEEKLY", {"interval" : 1})
1.238 ]
1.239
1.240 -l = order_qualifiers(qualifiers)
1.241 -show(l)
1.242 +sel = make_selectors(qualifiers)
1.243 +show(sel)
1.244 dt = (1997, 9, 2, 9, 0, 0)
1.245 l = get_datetime_structure(dt)
1.246 show(l)
1.247 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.248 -show(l)
1.249 +sel = combine_datetime_with_selectors(dt, sel)
1.250
1.251 -s = get_selector(dt, qualifiers)
1.252 +s = get_selector(dt, sel)
1.253 +show(sel)
1.254 +
1.255 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.256 print len(l) == 17, 17, len(l)
1.257 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.258 @@ -249,15 +260,16 @@
1.259 ("WEEKLY", {"interval" : 1})
1.260 ]
1.261
1.262 -l = order_qualifiers(qualifiers)
1.263 -show(l)
1.264 +sel = make_selectors(qualifiers)
1.265 +show(sel)
1.266 dt = (1997, 9, 2)
1.267 l = get_datetime_structure(dt)
1.268 show(l)
1.269 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.270 -show(l)
1.271 +sel = combine_datetime_with_selectors(dt, sel)
1.272
1.273 -s = get_selector(dt, qualifiers)
1.274 +s = get_selector(dt, sel)
1.275 +show(sel)
1.276 +
1.277 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.278 print len(l) == 17, 17, len(l)
1.279 print l[0] == (1997, 9, 2), (1997, 9, 2), l[0]
1.280 @@ -268,15 +280,16 @@
1.281 ("WEEKLY", {"interval" : 2})
1.282 ]
1.283
1.284 -l = order_qualifiers(qualifiers)
1.285 -show(l)
1.286 +sel = make_selectors(qualifiers)
1.287 +show(sel)
1.288 dt = (1997, 9, 2, 9, 0, 0)
1.289 l = get_datetime_structure(dt)
1.290 show(l)
1.291 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.292 -show(l)
1.293 +sel = combine_datetime_with_selectors(dt, sel)
1.294
1.295 -s = get_selector(dt, qualifiers)
1.296 +s = get_selector(dt, sel)
1.297 +show(sel)
1.298 +
1.299 l = s.materialise(dt, (1998, 2, 20, 0, 0, 0))
1.300 print len(l) == 13, 13, len(l)
1.301 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.302 @@ -288,15 +301,16 @@
1.303 ("BYDAY", {"values" : [(2, None), (4, None)]})
1.304 ]
1.305
1.306 -l = order_qualifiers(qualifiers)
1.307 -show(l)
1.308 +sel = make_selectors(qualifiers)
1.309 +show(sel)
1.310 dt = (1997, 9, 2, 9, 0, 0)
1.311 l = get_datetime_structure(dt)
1.312 show(l)
1.313 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.314 -show(l)
1.315 +sel = combine_datetime_with_selectors(dt, sel)
1.316
1.317 -s = get_selector(dt, qualifiers)
1.318 +s = get_selector(dt, sel)
1.319 +show(sel)
1.320 +
1.321 l = s.materialise(dt, (1997, 10, 7, 9, 0, 0))
1.322 print len(l) == 10, 10, len(l)
1.323 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.324 @@ -309,15 +323,16 @@
1.325 ("COUNT", {"values" : [10]})
1.326 ]
1.327
1.328 -l = order_qualifiers(qualifiers)
1.329 -show(l)
1.330 +sel = make_selectors(qualifiers)
1.331 +show(sel)
1.332 dt = (1997, 9, 2, 9, 0, 0)
1.333 l = get_datetime_structure(dt)
1.334 show(l)
1.335 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.336 -show(l)
1.337 +sel = combine_datetime_with_selectors(dt, sel)
1.338
1.339 -s = get_selector(dt, qualifiers)
1.340 +s = get_selector(dt, sel)
1.341 +show(sel)
1.342 +
1.343 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.344 print len(l) == 10, 10, len(l)
1.345 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.346 @@ -329,15 +344,16 @@
1.347 ("BYDAY", {"values" : [(1, None), (3, None), (5, None)]})
1.348 ]
1.349
1.350 -l = order_qualifiers(qualifiers)
1.351 -show(l)
1.352 +sel = make_selectors(qualifiers)
1.353 +show(sel)
1.354 dt = (1997, 9, 1, 9, 0, 0)
1.355 l = get_datetime_structure(dt)
1.356 show(l)
1.357 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.358 -show(l)
1.359 +sel = combine_datetime_with_selectors(dt, sel)
1.360
1.361 -s = get_selector(dt, qualifiers)
1.362 +s = get_selector(dt, sel)
1.363 +show(sel)
1.364 +
1.365 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.366 print len(l) == 25, 25, len(l)
1.367 print l[0] == (1997, 9, 1, 9, 0, 0), (1997, 9, 1, 9, 0, 0), l[0]
1.368 @@ -350,15 +366,16 @@
1.369 ("COUNT", {"values" : [8]})
1.370 ]
1.371
1.372 -l = order_qualifiers(qualifiers)
1.373 -show(l)
1.374 +sel = make_selectors(qualifiers)
1.375 +show(sel)
1.376 dt = (1997, 9, 2, 9, 0, 0)
1.377 l = get_datetime_structure(dt)
1.378 show(l)
1.379 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.380 -show(l)
1.381 +sel = combine_datetime_with_selectors(dt, sel)
1.382
1.383 -s = get_selector(dt, qualifiers)
1.384 +s = get_selector(dt, sel)
1.385 +show(sel)
1.386 +
1.387 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.388 print len(l) == 8, 8, len(l)
1.389 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.390 @@ -371,15 +388,16 @@
1.391 ("COUNT", {"values" : [10]})
1.392 ]
1.393
1.394 -l = order_qualifiers(qualifiers)
1.395 -show(l)
1.396 +sel = make_selectors(qualifiers)
1.397 +show(sel)
1.398 dt = (1997, 9, 5, 9, 0, 0)
1.399 l = get_datetime_structure(dt)
1.400 show(l)
1.401 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.402 -show(l)
1.403 +sel = combine_datetime_with_selectors(dt, sel)
1.404
1.405 -s = get_selector(dt, qualifiers)
1.406 +s = get_selector(dt, sel)
1.407 +show(sel)
1.408 +
1.409 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.410 print len(l) == 10, 10, len(l)
1.411 print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
1.412 @@ -391,15 +409,16 @@
1.413 ("BYDAY", {"values" : [(5, 1)]})
1.414 ]
1.415
1.416 -l = order_qualifiers(qualifiers)
1.417 -show(l)
1.418 +sel = make_selectors(qualifiers)
1.419 +show(sel)
1.420 dt = (1997, 9, 5, 9, 0, 0)
1.421 l = get_datetime_structure(dt)
1.422 show(l)
1.423 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.424 -show(l)
1.425 +sel = combine_datetime_with_selectors(dt, sel)
1.426
1.427 -s = get_selector(dt, qualifiers)
1.428 +s = get_selector(dt, sel)
1.429 +show(sel)
1.430 +
1.431 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.432 print len(l) == 4, 4, len(l)
1.433 print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
1.434 @@ -412,15 +431,16 @@
1.435 ("COUNT", {"values" : [10]})
1.436 ]
1.437
1.438 -l = order_qualifiers(qualifiers)
1.439 -show(l)
1.440 +sel = make_selectors(qualifiers)
1.441 +show(sel)
1.442 dt = (1997, 9, 7, 9, 0, 0)
1.443 l = get_datetime_structure(dt)
1.444 show(l)
1.445 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.446 -show(l)
1.447 +sel = combine_datetime_with_selectors(dt, sel)
1.448
1.449 -s = get_selector(dt, qualifiers)
1.450 +s = get_selector(dt, sel)
1.451 +show(sel)
1.452 +
1.453 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.454 print len(l) == 10, 10, len(l)
1.455 print l[0] == (1997, 9, 7, 9, 0, 0), (1997, 9, 7, 9, 0, 0), l[0]
1.456 @@ -433,15 +453,16 @@
1.457 ("COUNT", {"values" : [6]})
1.458 ]
1.459
1.460 -l = order_qualifiers(qualifiers)
1.461 -show(l)
1.462 +sel = make_selectors(qualifiers)
1.463 +show(sel)
1.464 dt = (1997, 9, 22, 9, 0, 0)
1.465 l = get_datetime_structure(dt)
1.466 show(l)
1.467 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.468 -show(l)
1.469 +sel = combine_datetime_with_selectors(dt, sel)
1.470
1.471 -s = get_selector(dt, qualifiers)
1.472 +s = get_selector(dt, sel)
1.473 +show(sel)
1.474 +
1.475 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.476 print len(l) == 6, 6, len(l)
1.477 print l[0] == (1997, 9, 22, 9, 0, 0), (1997, 9, 22, 9, 0, 0), l[0]
1.478 @@ -454,15 +475,16 @@
1.479 ("COUNT", {"values" : [6]})
1.480 ]
1.481
1.482 -l = order_qualifiers(qualifiers)
1.483 -show(l)
1.484 +sel = make_selectors(qualifiers)
1.485 +show(sel)
1.486 dt = (1997, 9, 28, 9, 0, 0)
1.487 l = get_datetime_structure(dt)
1.488 show(l)
1.489 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.490 -show(l)
1.491 +sel = combine_datetime_with_selectors(dt, sel)
1.492
1.493 -s = get_selector(dt, qualifiers)
1.494 +s = get_selector(dt, sel)
1.495 +show(sel)
1.496 +
1.497 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.498 print len(l) == 6, 6, len(l)
1.499 print l[0] == (1997, 9, 28, 9, 0, 0), (1997, 9, 28, 9, 0, 0), l[0]
1.500 @@ -475,15 +497,16 @@
1.501 ("COUNT", {"values" : [10]})
1.502 ]
1.503
1.504 -l = order_qualifiers(qualifiers)
1.505 -show(l)
1.506 +sel = make_selectors(qualifiers)
1.507 +show(sel)
1.508 dt = (1997, 9, 2, 9, 0, 0)
1.509 l = get_datetime_structure(dt)
1.510 show(l)
1.511 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.512 -show(l)
1.513 +sel = combine_datetime_with_selectors(dt, sel)
1.514
1.515 -s = get_selector(dt, qualifiers)
1.516 +s = get_selector(dt, sel)
1.517 +show(sel)
1.518 +
1.519 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.520 print len(l) == 10, 10, len(l)
1.521 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.522 @@ -496,15 +519,16 @@
1.523 ("COUNT", {"values" : [10]})
1.524 ]
1.525
1.526 -l = order_qualifiers(qualifiers)
1.527 -show(l)
1.528 +sel = make_selectors(qualifiers)
1.529 +show(sel)
1.530 dt = (1997, 9, 30, 9, 0, 0)
1.531 l = get_datetime_structure(dt)
1.532 show(l)
1.533 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.534 -show(l)
1.535 +sel = combine_datetime_with_selectors(dt, sel)
1.536
1.537 -s = get_selector(dt, qualifiers)
1.538 +s = get_selector(dt, sel)
1.539 +show(sel)
1.540 +
1.541 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.542 print len(l) == 10, 10, len(l)
1.543 print l[0] == (1997, 9, 30, 9, 0, 0), (1997, 9, 30, 9, 0, 0), l[0]
1.544 @@ -517,15 +541,16 @@
1.545 ("COUNT", {"values" : [10]})
1.546 ]
1.547
1.548 -l = order_qualifiers(qualifiers)
1.549 -show(l)
1.550 +sel = make_selectors(qualifiers)
1.551 +show(sel)
1.552 dt = (1997, 9, 10, 9, 0, 0)
1.553 l = get_datetime_structure(dt)
1.554 show(l)
1.555 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.556 -show(l)
1.557 +sel = combine_datetime_with_selectors(dt, sel)
1.558
1.559 -s = get_selector(dt, qualifiers)
1.560 +s = get_selector(dt, sel)
1.561 +show(sel)
1.562 +
1.563 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.564 print len(l) == 10, 10, len(l)
1.565 print l[0] == (1997, 9, 10, 9, 0, 0), (1997, 9, 10, 9, 0, 0), l[0]
1.566 @@ -537,15 +562,16 @@
1.567 ("BYDAY", {"values" : [(2, None)]})
1.568 ]
1.569
1.570 -l = order_qualifiers(qualifiers)
1.571 -show(l)
1.572 +sel = make_selectors(qualifiers)
1.573 +show(sel)
1.574 dt = (1997, 9, 2, 9, 0, 0)
1.575 l = get_datetime_structure(dt)
1.576 show(l)
1.577 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.578 -show(l)
1.579 +sel = combine_datetime_with_selectors(dt, sel)
1.580
1.581 -s = get_selector(dt, qualifiers)
1.582 +s = get_selector(dt, sel)
1.583 +show(sel)
1.584 +
1.585 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.586 print len(l) == 18, 18, len(l)
1.587 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.588 @@ -558,15 +584,16 @@
1.589 ("COUNT", {"values" : [10]})
1.590 ]
1.591
1.592 -l = order_qualifiers(qualifiers)
1.593 -show(l)
1.594 +sel = make_selectors(qualifiers)
1.595 +show(sel)
1.596 dt = (1997, 6, 10, 9, 0, 0)
1.597 l = get_datetime_structure(dt)
1.598 show(l)
1.599 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.600 -show(l)
1.601 +sel = combine_datetime_with_selectors(dt, sel)
1.602
1.603 -s = get_selector(dt, qualifiers)
1.604 +s = get_selector(dt, sel)
1.605 +show(sel)
1.606 +
1.607 l = s.materialise(dt, (2001, 12, 24, 0, 0, 0))
1.608 print len(l) == 10, 10, len(l)
1.609 print l[0] == (1997, 6, 10, 9, 0, 0), (1997, 6, 10, 9, 0, 0), l[0]
1.610 @@ -579,15 +606,16 @@
1.611 ("COUNT", {"values" : [10]})
1.612 ]
1.613
1.614 -l = order_qualifiers(qualifiers)
1.615 -show(l)
1.616 +sel = make_selectors(qualifiers)
1.617 +show(sel)
1.618 dt = (1997, 3, 10, 9, 0, 0)
1.619 l = get_datetime_structure(dt)
1.620 show(l)
1.621 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.622 -show(l)
1.623 +sel = combine_datetime_with_selectors(dt, sel)
1.624
1.625 -s = get_selector(dt, qualifiers)
1.626 +s = get_selector(dt, sel)
1.627 +show(sel)
1.628 +
1.629 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.630 print len(l) == 10, 10, len(l)
1.631 print l[0] == (1997, 3, 10, 9, 0, 0), (1997, 3, 10, 9, 0, 0), l[0]
1.632 @@ -600,15 +628,16 @@
1.633 ("COUNT", {"values" : [10]})
1.634 ]
1.635
1.636 -l = order_qualifiers(qualifiers)
1.637 -show(l)
1.638 +sel = make_selectors(qualifiers)
1.639 +show(sel)
1.640 dt = (1997, 1, 1, 9, 0, 0)
1.641 l = get_datetime_structure(dt)
1.642 show(l)
1.643 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.644 -show(l)
1.645 +sel = combine_datetime_with_selectors(dt, sel)
1.646
1.647 -s = get_selector(dt, qualifiers)
1.648 +s = get_selector(dt, sel)
1.649 +show(sel)
1.650 +
1.651 l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
1.652 print len(l) == 10, 10, len(l)
1.653 print l[0] == (1997, 1, 1, 9, 0, 0), (1997, 1, 1, 9, 0, 0), l[0]
1.654 @@ -620,15 +649,16 @@
1.655 ("BYDAY", {"values" : [(1, 20)]})
1.656 ]
1.657
1.658 -l = order_qualifiers(qualifiers)
1.659 -show(l)
1.660 +sel = make_selectors(qualifiers)
1.661 +show(sel)
1.662 dt = (1997, 5, 19, 9, 0, 0)
1.663 l = get_datetime_structure(dt)
1.664 show(l)
1.665 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.666 -show(l)
1.667 +sel = combine_datetime_with_selectors(dt, sel)
1.668
1.669 -s = get_selector(dt, qualifiers)
1.670 +s = get_selector(dt, sel)
1.671 +show(sel)
1.672 +
1.673 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.674 print len(l) == 3, 3, len(l)
1.675 print l[0] == (1997, 5, 19, 9, 0, 0), (1997, 5, 19, 9, 0, 0), l[0]
1.676 @@ -642,15 +672,16 @@
1.677 ("BYDAY", {"values" : [(1, None)]})
1.678 ]
1.679
1.680 -l = order_qualifiers(qualifiers)
1.681 -show(l)
1.682 +sel = make_selectors(qualifiers)
1.683 +show(sel)
1.684 dt = (1997, 5, 12, 9, 0, 0)
1.685 l = get_datetime_structure(dt)
1.686 show(l)
1.687 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.688 -show(l)
1.689 +sel = combine_datetime_with_selectors(dt, sel)
1.690
1.691 -s = get_selector(dt, qualifiers)
1.692 +s = get_selector(dt, sel)
1.693 +show(sel)
1.694 +
1.695 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.696 print len(l) == 3, 3, len(l)
1.697 print l[0] == (1997, 5, 12, 9, 0, 0), (1997, 5, 12, 9, 0, 0), l[0]
1.698 @@ -664,15 +695,16 @@
1.699 ("BYDAY", {"values" : [(4, None)]})
1.700 ]
1.701
1.702 -l = order_qualifiers(qualifiers)
1.703 -show(l)
1.704 +sel = make_selectors(qualifiers)
1.705 +show(sel)
1.706 dt = (1997, 3, 13, 9, 0, 0)
1.707 l = get_datetime_structure(dt)
1.708 show(l)
1.709 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.710 -show(l)
1.711 +sel = combine_datetime_with_selectors(dt, sel)
1.712
1.713 -s = get_selector(dt, qualifiers)
1.714 +s = get_selector(dt, sel)
1.715 +show(sel)
1.716 +
1.717 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.718 print len(l) == 11, 11, len(l)
1.719 print l[0] == (1997, 3, 13, 9, 0, 0), (1997, 3, 13, 9, 0, 0), l[0]
1.720 @@ -685,15 +717,16 @@
1.721 ("BYDAY", {"values" : [(4, None)]})
1.722 ]
1.723
1.724 -l = order_qualifiers(qualifiers)
1.725 -show(l)
1.726 +sel = make_selectors(qualifiers)
1.727 +show(sel)
1.728 dt = (1997, 6, 5, 9, 0, 0)
1.729 l = get_datetime_structure(dt)
1.730 show(l)
1.731 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.732 -show(l)
1.733 +sel = combine_datetime_with_selectors(dt, sel)
1.734
1.735 -s = get_selector(dt, qualifiers)
1.736 +s = get_selector(dt, sel)
1.737 +show(sel)
1.738 +
1.739 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.740 print len(l) == 39, 39, len(l)
1.741 print l[0] == (1997, 6, 5, 9, 0, 0), (1997, 6, 5, 9, 0, 0), l[0]
1.742 @@ -706,18 +739,19 @@
1.743 ("BYDAY", {"values" : [(5, None)]})
1.744 ]
1.745
1.746 -l = order_qualifiers(qualifiers)
1.747 -show(l)
1.748 +sel = make_selectors(qualifiers)
1.749 +show(sel)
1.750 dt = (1997, 9, 2, 9, 0, 0)
1.751 l = get_datetime_structure(dt)
1.752 show(l)
1.753 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.754 -show(l)
1.755 +sel = combine_datetime_with_selectors(dt, sel)
1.756
1.757 -s = get_selector(dt, qualifiers)
1.758 +s = get_selector(dt, sel)
1.759 +show(sel)
1.760 +
1.761 l = s.materialise(dt, (2000, 12, 24, 0, 0, 0))
1.762 -print len(l) == 5, 5, len(l)
1.763 -print l[0] == (1998, 2, 13, 9, 0, 0), (1998, 2, 13, 9, 0, 0), l[0]
1.764 +print len(l) == 6, 6, len(l)
1.765 +print l[1] == (1998, 2, 13, 9, 0, 0), (1998, 2, 13, 9, 0, 0), l[1]
1.766 print l[-1] == (2000, 10, 13, 9, 0, 0), (2000, 10, 13, 9, 0, 0), l[-1]
1.767 print
1.768
1.769 @@ -727,15 +761,16 @@
1.770 ("BYDAY", {"values" : [(6, None)]})
1.771 ]
1.772
1.773 -l = order_qualifiers(qualifiers)
1.774 -show(l)
1.775 +sel = make_selectors(qualifiers)
1.776 +show(sel)
1.777 dt = (1997, 9, 13, 9, 0, 0)
1.778 l = get_datetime_structure(dt)
1.779 show(l)
1.780 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.781 -show(l)
1.782 +sel = combine_datetime_with_selectors(dt, sel)
1.783
1.784 -s = get_selector(dt, qualifiers)
1.785 +s = get_selector(dt, sel)
1.786 +show(sel)
1.787 +
1.788 l = s.materialise(dt, (1998, 6, 30, 0, 0, 0))
1.789 print len(l) == 10, 10, len(l)
1.790 print l[0] == (1997, 9, 13, 9, 0, 0), (1997, 9, 13, 9, 0, 0), l[0]
1.791 @@ -749,15 +784,16 @@
1.792 ("BYDAY", {"values" : [(2, None)]})
1.793 ]
1.794
1.795 -l = order_qualifiers(qualifiers)
1.796 -show(l)
1.797 +sel = make_selectors(qualifiers)
1.798 +show(sel)
1.799 dt = (1996, 11, 5, 9, 0, 0)
1.800 l = get_datetime_structure(dt)
1.801 show(l)
1.802 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.803 -show(l)
1.804 +sel = combine_datetime_with_selectors(dt, sel)
1.805
1.806 -s = get_selector(dt, qualifiers)
1.807 +s = get_selector(dt, sel)
1.808 +show(sel)
1.809 +
1.810 l = s.materialise(dt, (2004, 12, 24, 0, 0, 0))
1.811 print len(l) == 3, 3, len(l)
1.812 print l[0] == (1996, 11, 5, 9, 0, 0), (1996, 11, 5, 9, 0, 0), l[0]
1.813 @@ -771,15 +807,16 @@
1.814 ("COUNT", {"values" : [3]})
1.815 ]
1.816
1.817 -l = order_qualifiers(qualifiers)
1.818 -show(l)
1.819 +sel = make_selectors(qualifiers)
1.820 +show(sel)
1.821 dt = (1997, 9, 4, 9, 0, 0)
1.822 l = get_datetime_structure(dt)
1.823 show(l)
1.824 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.825 -show(l)
1.826 +sel = combine_datetime_with_selectors(dt, sel)
1.827
1.828 -s = get_selector(dt, qualifiers)
1.829 +s = get_selector(dt, sel)
1.830 +show(sel)
1.831 +
1.832 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.833 print len(l) == 3, 3, len(l)
1.834 print l[0] == (1997, 9, 4, 9, 0, 0), (1997, 9, 4, 9, 0, 0), l[0]
1.835 @@ -794,67 +831,71 @@
1.836 ("BYSETPOS", {"values" : [-2]})
1.837 ]
1.838
1.839 -l = order_qualifiers(qualifiers)
1.840 -show(l)
1.841 +sel = make_selectors(qualifiers)
1.842 +show(sel)
1.843 dt = (1997, 9, 29, 9, 0, 0)
1.844 l = get_datetime_structure(dt)
1.845 show(l)
1.846 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.847 -show(l)
1.848 +sel = combine_datetime_with_selectors(dt, sel)
1.849
1.850 -s = get_selector(dt, qualifiers)
1.851 +s = get_selector(dt, sel)
1.852 +show(sel)
1.853 +
1.854 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.855 print len(l) == 7, 7, len(l)
1.856 print l[0] == (1997, 9, 29, 9, 0, 0), (1997, 9, 29, 9, 0, 0), l[0]
1.857 print l[-1] == (1998, 3, 30, 9, 0, 0), (1998, 3, 30, 9, 0, 0), l[-1]
1.858 print
1.859
1.860 -qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"])
1.861 +qualifiers = get_qualifiers(["BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"])
1.862
1.863 -l = order_qualifiers(qualifiers)
1.864 -show(l)
1.865 +sel = make_selectors(qualifiers)
1.866 +show(sel)
1.867 dt = (2017, 6, 13)
1.868 l = get_datetime_structure(dt)
1.869 show(l)
1.870 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.871 -show(l)
1.872 +sel = combine_datetime_with_selectors(dt, sel)
1.873
1.874 -s = get_selector(dt, qualifiers)
1.875 +s = get_selector(dt, sel)
1.876 +show(sel)
1.877 +
1.878 l = s.materialise(dt, (2019, 1, 1))
1.879 -print len(l) == 36
1.880 -print l[0] == (2017, 7, 5, 0), (2017, 7, 5, 0), l[0]
1.881 +print len(l) == 37, 37, len(l)
1.882 +print l[1] == (2017, 7, 5, 0), (2017, 7, 5, 0), l[1]
1.883 print l[-1] == (2018, 12, 5, 12), (2018, 12, 5, 12), l[-1]
1.884
1.885 qualifiers = get_qualifiers(["FREQ=DAILY", "BYMONTH=1"])
1.886
1.887 -l = order_qualifiers(qualifiers)
1.888 -show(l)
1.889 +sel = make_selectors(qualifiers)
1.890 +show(sel)
1.891 dt = (2017, 6, 13)
1.892 l = get_datetime_structure(dt)
1.893 show(l)
1.894 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.895 -show(l)
1.896 +sel = combine_datetime_with_selectors(dt, sel)
1.897
1.898 -s = get_selector(dt, qualifiers)
1.899 +s = get_selector(dt, sel)
1.900 +show(sel)
1.901 +
1.902 l = s.materialise(dt, (2019, 1, 1))
1.903 -print len(l) == 31
1.904 -print l[0] == (2018, 1, 1), (2018, 1, 1), l[0]
1.905 +print len(l) == 32, 32, len(l)
1.906 +print l[1] == (2018, 1, 1), (2018, 1, 1), l[1]
1.907 print l[-1] == (2018, 1, 31), (2018, 1, 31), l[-1]
1.908
1.909 qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYDAY=WE,1FR,2MO,2FR"])
1.910
1.911 -l = order_qualifiers(qualifiers)
1.912 -show(l)
1.913 +sel = make_selectors(qualifiers)
1.914 +show(sel)
1.915 dt = (2017, 10, 15)
1.916 l = get_datetime_structure(dt)
1.917 show(l)
1.918 -l = combine_datetime_with_qualifiers(dt, qualifiers)
1.919 -show(l)
1.920 +sel = combine_datetime_with_selectors(dt, sel)
1.921
1.922 -s = get_selector(dt, qualifiers)
1.923 +s = get_selector(dt, sel)
1.924 +show(sel)
1.925 +
1.926 l = s.materialise(dt, (2018, 1, 1))
1.927 -print len(l) == 17
1.928 -print l[0] == (2017, 10, 18), (2017, 10, 18), l[0]
1.929 +print len(l) == 18, 18, len(l)
1.930 +print l[1] == (2017, 10, 18), (2017, 10, 18), l[1]
1.931 print l[-1] == (2017, 12, 27), (2017, 12, 27), l[-1]
1.932
1.933 # vim: tabstop=4 expandtab shiftwidth=4