1.1 --- a/tests/qualifiers.py Sun Dec 03 01:29:03 2017 +0100
1.2 +++ b/tests/qualifiers.py Sun Dec 03 17:13:17 2017 +0100
1.3 @@ -35,10 +35,10 @@
1.4 dt = (1997, 11, 2)
1.5 l = get_datetime_structure(dt)
1.6 show(l)
1.7 -sel = combine_datetime_with_selectors(dt, sel)
1.8 +csel = combine_datetime_with_selectors(dt, sel)
1.9 +show(csel)
1.10
1.11 s = get_selector(dt, sel)
1.12 -show(sel)
1.13
1.14 l = s.materialise(dt, (2003, 12, 24))
1.15 print len(l) == 7, 7, len(l)
1.16 @@ -59,10 +59,10 @@
1.17 dt = (1997, 1, 5, 8, 30, 0)
1.18 l = get_datetime_structure(dt)
1.19 show(l)
1.20 -sel = combine_datetime_with_selectors(dt, sel)
1.21 +csel = combine_datetime_with_selectors(dt, sel)
1.22 +show(csel)
1.23
1.24 s = get_selector(dt, sel)
1.25 -show(sel)
1.26
1.27 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.28 print len(l) == 34, 34, len(l)
1.29 @@ -80,10 +80,10 @@
1.30 dt = (1997, 9, 2, 9, 0, 0)
1.31 l = get_datetime_structure(dt)
1.32 show(l)
1.33 -sel = combine_datetime_with_selectors(dt, sel)
1.34 +csel = combine_datetime_with_selectors(dt, sel)
1.35 +show(csel)
1.36
1.37 s = get_selector(dt, sel)
1.38 -show(sel)
1.39
1.40 l = s.materialise(dt, (1997, 12, 24))
1.41 print len(l) == 10, 10, len(l)
1.42 @@ -100,10 +100,10 @@
1.43 dt = (1997, 9, 2, 9, 0, 0)
1.44 l = get_datetime_structure(dt)
1.45 show(l)
1.46 -sel = combine_datetime_with_selectors(dt, sel)
1.47 +csel = combine_datetime_with_selectors(dt, sel)
1.48 +show(csel)
1.49
1.50 s = get_selector(dt, sel)
1.51 -show(sel)
1.52
1.53 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.54 print len(l) == 113, 113, len(l)
1.55 @@ -120,10 +120,10 @@
1.56 dt = (1997, 9, 2, 9, 0, 0)
1.57 l = get_datetime_structure(dt)
1.58 show(l)
1.59 -sel = combine_datetime_with_selectors(dt, sel)
1.60 +csel = combine_datetime_with_selectors(dt, sel)
1.61 +show(csel)
1.62
1.63 s = get_selector(dt, sel)
1.64 -show(sel)
1.65
1.66 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.67 print len(l) == 57, 57, len(l)
1.68 @@ -140,10 +140,10 @@
1.69 dt = (1997, 9, 2, 9, 0, 0)
1.70 l = get_datetime_structure(dt)
1.71 show(l)
1.72 -sel = combine_datetime_with_selectors(dt, sel)
1.73 +csel = combine_datetime_with_selectors(dt, sel)
1.74 +show(csel)
1.75
1.76 s = get_selector(dt, sel)
1.77 -show(sel)
1.78
1.79 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.80 print len(l) == 17, 17, len(l)
1.81 @@ -161,10 +161,10 @@
1.82 dt = (1997, 9, 2, 9, 0, 0)
1.83 l = get_datetime_structure(dt)
1.84 show(l)
1.85 -sel = combine_datetime_with_selectors(dt, sel)
1.86 +csel = combine_datetime_with_selectors(dt, sel)
1.87 +show(csel)
1.88
1.89 s = get_selector(dt, sel)
1.90 -show(sel)
1.91
1.92 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.93 print len(l) == 5, 5, len(l)
1.94 @@ -183,10 +183,10 @@
1.95 dt = (1998, 1, 1, 9, 0, 0)
1.96 l = get_datetime_structure(dt)
1.97 show(l)
1.98 -sel = combine_datetime_with_selectors(dt, sel)
1.99 +csel = combine_datetime_with_selectors(dt, sel)
1.100 +show(csel)
1.101
1.102 s = get_selector(dt, sel)
1.103 -show(sel)
1.104
1.105 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.106 print len(l) == 93, 93, len(l)
1.107 @@ -204,10 +204,10 @@
1.108 dt = (1998, 1, 1, 9, 0, 0)
1.109 l = get_datetime_structure(dt)
1.110 show(l)
1.111 -sel = combine_datetime_with_selectors(dt, sel)
1.112 +csel = combine_datetime_with_selectors(dt, sel)
1.113 +show(csel)
1.114
1.115 s = get_selector(dt, sel)
1.116 -show(sel)
1.117
1.118 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.119 print len(l) == 93, 93, len(l)
1.120 @@ -225,10 +225,10 @@
1.121 dt = (1997, 9, 2, 9, 0, 0)
1.122 l = get_datetime_structure(dt)
1.123 show(l)
1.124 -sel = combine_datetime_with_selectors(dt, sel)
1.125 +csel = combine_datetime_with_selectors(dt, sel)
1.126 +show(csel)
1.127
1.128 s = get_selector(dt, sel)
1.129 -show(sel)
1.130
1.131 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.132 print len(l) == 10, 10, len(l)
1.133 @@ -245,10 +245,10 @@
1.134 dt = (1997, 9, 2, 9, 0, 0)
1.135 l = get_datetime_structure(dt)
1.136 show(l)
1.137 -sel = combine_datetime_with_selectors(dt, sel)
1.138 +csel = combine_datetime_with_selectors(dt, sel)
1.139 +show(csel)
1.140
1.141 s = get_selector(dt, sel)
1.142 -show(sel)
1.143
1.144 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.145 print len(l) == 17, 17, len(l)
1.146 @@ -265,10 +265,10 @@
1.147 dt = (1997, 9, 2)
1.148 l = get_datetime_structure(dt)
1.149 show(l)
1.150 -sel = combine_datetime_with_selectors(dt, sel)
1.151 +csel = combine_datetime_with_selectors(dt, sel)
1.152 +show(csel)
1.153
1.154 s = get_selector(dt, sel)
1.155 -show(sel)
1.156
1.157 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.158 print len(l) == 17, 17, len(l)
1.159 @@ -285,10 +285,10 @@
1.160 dt = (1997, 9, 2, 9, 0, 0)
1.161 l = get_datetime_structure(dt)
1.162 show(l)
1.163 -sel = combine_datetime_with_selectors(dt, sel)
1.164 +csel = combine_datetime_with_selectors(dt, sel)
1.165 +show(csel)
1.166
1.167 s = get_selector(dt, sel)
1.168 -show(sel)
1.169
1.170 l = s.materialise(dt, (1998, 2, 20, 0, 0, 0))
1.171 print len(l) == 13, 13, len(l)
1.172 @@ -306,10 +306,10 @@
1.173 dt = (1997, 9, 2, 9, 0, 0)
1.174 l = get_datetime_structure(dt)
1.175 show(l)
1.176 -sel = combine_datetime_with_selectors(dt, sel)
1.177 +csel = combine_datetime_with_selectors(dt, sel)
1.178 +show(csel)
1.179
1.180 s = get_selector(dt, sel)
1.181 -show(sel)
1.182
1.183 l = s.materialise(dt, (1997, 10, 7, 9, 0, 0))
1.184 print len(l) == 10, 10, len(l)
1.185 @@ -328,10 +328,10 @@
1.186 dt = (1997, 9, 2, 9, 0, 0)
1.187 l = get_datetime_structure(dt)
1.188 show(l)
1.189 -sel = combine_datetime_with_selectors(dt, sel)
1.190 +csel = combine_datetime_with_selectors(dt, sel)
1.191 +show(csel)
1.192
1.193 s = get_selector(dt, sel)
1.194 -show(sel)
1.195
1.196 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.197 print len(l) == 10, 10, len(l)
1.198 @@ -349,10 +349,10 @@
1.199 dt = (1997, 9, 1, 9, 0, 0)
1.200 l = get_datetime_structure(dt)
1.201 show(l)
1.202 -sel = combine_datetime_with_selectors(dt, sel)
1.203 +csel = combine_datetime_with_selectors(dt, sel)
1.204 +show(csel)
1.205
1.206 s = get_selector(dt, sel)
1.207 -show(sel)
1.208
1.209 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.210 print len(l) == 25, 25, len(l)
1.211 @@ -371,10 +371,10 @@
1.212 dt = (1997, 9, 2, 9, 0, 0)
1.213 l = get_datetime_structure(dt)
1.214 show(l)
1.215 -sel = combine_datetime_with_selectors(dt, sel)
1.216 +csel = combine_datetime_with_selectors(dt, sel)
1.217 +show(csel)
1.218
1.219 s = get_selector(dt, sel)
1.220 -show(sel)
1.221
1.222 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.223 print len(l) == 8, 8, len(l)
1.224 @@ -393,10 +393,10 @@
1.225 dt = (1997, 9, 5, 9, 0, 0)
1.226 l = get_datetime_structure(dt)
1.227 show(l)
1.228 -sel = combine_datetime_with_selectors(dt, sel)
1.229 +csel = combine_datetime_with_selectors(dt, sel)
1.230 +show(csel)
1.231
1.232 s = get_selector(dt, sel)
1.233 -show(sel)
1.234
1.235 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.236 print len(l) == 10, 10, len(l)
1.237 @@ -414,10 +414,10 @@
1.238 dt = (1997, 9, 5, 9, 0, 0)
1.239 l = get_datetime_structure(dt)
1.240 show(l)
1.241 -sel = combine_datetime_with_selectors(dt, sel)
1.242 +csel = combine_datetime_with_selectors(dt, sel)
1.243 +show(csel)
1.244
1.245 s = get_selector(dt, sel)
1.246 -show(sel)
1.247
1.248 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.249 print len(l) == 4, 4, len(l)
1.250 @@ -436,10 +436,10 @@
1.251 dt = (1997, 9, 7, 9, 0, 0)
1.252 l = get_datetime_structure(dt)
1.253 show(l)
1.254 -sel = combine_datetime_with_selectors(dt, sel)
1.255 +csel = combine_datetime_with_selectors(dt, sel)
1.256 +show(csel)
1.257
1.258 s = get_selector(dt, sel)
1.259 -show(sel)
1.260
1.261 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.262 print len(l) == 10, 10, len(l)
1.263 @@ -458,10 +458,10 @@
1.264 dt = (1997, 9, 22, 9, 0, 0)
1.265 l = get_datetime_structure(dt)
1.266 show(l)
1.267 -sel = combine_datetime_with_selectors(dt, sel)
1.268 +csel = combine_datetime_with_selectors(dt, sel)
1.269 +show(csel)
1.270
1.271 s = get_selector(dt, sel)
1.272 -show(sel)
1.273
1.274 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.275 print len(l) == 6, 6, len(l)
1.276 @@ -480,10 +480,10 @@
1.277 dt = (1997, 9, 28, 9, 0, 0)
1.278 l = get_datetime_structure(dt)
1.279 show(l)
1.280 -sel = combine_datetime_with_selectors(dt, sel)
1.281 +csel = combine_datetime_with_selectors(dt, sel)
1.282 +show(csel)
1.283
1.284 s = get_selector(dt, sel)
1.285 -show(sel)
1.286
1.287 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.288 print len(l) == 6, 6, len(l)
1.289 @@ -502,10 +502,10 @@
1.290 dt = (1997, 9, 2, 9, 0, 0)
1.291 l = get_datetime_structure(dt)
1.292 show(l)
1.293 -sel = combine_datetime_with_selectors(dt, sel)
1.294 +csel = combine_datetime_with_selectors(dt, sel)
1.295 +show(csel)
1.296
1.297 s = get_selector(dt, sel)
1.298 -show(sel)
1.299
1.300 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.301 print len(l) == 10, 10, len(l)
1.302 @@ -524,10 +524,10 @@
1.303 dt = (1997, 9, 30, 9, 0, 0)
1.304 l = get_datetime_structure(dt)
1.305 show(l)
1.306 -sel = combine_datetime_with_selectors(dt, sel)
1.307 +csel = combine_datetime_with_selectors(dt, sel)
1.308 +show(csel)
1.309
1.310 s = get_selector(dt, sel)
1.311 -show(sel)
1.312
1.313 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.314 print len(l) == 10, 10, len(l)
1.315 @@ -546,10 +546,10 @@
1.316 dt = (1997, 9, 10, 9, 0, 0)
1.317 l = get_datetime_structure(dt)
1.318 show(l)
1.319 -sel = combine_datetime_with_selectors(dt, sel)
1.320 +csel = combine_datetime_with_selectors(dt, sel)
1.321 +show(csel)
1.322
1.323 s = get_selector(dt, sel)
1.324 -show(sel)
1.325
1.326 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.327 print len(l) == 10, 10, len(l)
1.328 @@ -567,10 +567,10 @@
1.329 dt = (1997, 9, 2, 9, 0, 0)
1.330 l = get_datetime_structure(dt)
1.331 show(l)
1.332 -sel = combine_datetime_with_selectors(dt, sel)
1.333 +csel = combine_datetime_with_selectors(dt, sel)
1.334 +show(csel)
1.335
1.336 s = get_selector(dt, sel)
1.337 -show(sel)
1.338
1.339 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.340 print len(l) == 18, 18, len(l)
1.341 @@ -589,10 +589,10 @@
1.342 dt = (1997, 6, 10, 9, 0, 0)
1.343 l = get_datetime_structure(dt)
1.344 show(l)
1.345 -sel = combine_datetime_with_selectors(dt, sel)
1.346 +csel = combine_datetime_with_selectors(dt, sel)
1.347 +show(csel)
1.348
1.349 s = get_selector(dt, sel)
1.350 -show(sel)
1.351
1.352 l = s.materialise(dt, (2001, 12, 24, 0, 0, 0))
1.353 print len(l) == 10, 10, len(l)
1.354 @@ -611,10 +611,10 @@
1.355 dt = (1997, 3, 10, 9, 0, 0)
1.356 l = get_datetime_structure(dt)
1.357 show(l)
1.358 -sel = combine_datetime_with_selectors(dt, sel)
1.359 +csel = combine_datetime_with_selectors(dt, sel)
1.360 +show(csel)
1.361
1.362 s = get_selector(dt, sel)
1.363 -show(sel)
1.364
1.365 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.366 print len(l) == 10, 10, len(l)
1.367 @@ -633,10 +633,10 @@
1.368 dt = (1997, 1, 1, 9, 0, 0)
1.369 l = get_datetime_structure(dt)
1.370 show(l)
1.371 -sel = combine_datetime_with_selectors(dt, sel)
1.372 +csel = combine_datetime_with_selectors(dt, sel)
1.373 +show(csel)
1.374
1.375 s = get_selector(dt, sel)
1.376 -show(sel)
1.377
1.378 l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
1.379 print len(l) == 10, 10, len(l)
1.380 @@ -654,10 +654,10 @@
1.381 dt = (1997, 5, 19, 9, 0, 0)
1.382 l = get_datetime_structure(dt)
1.383 show(l)
1.384 -sel = combine_datetime_with_selectors(dt, sel)
1.385 +csel = combine_datetime_with_selectors(dt, sel)
1.386 +show(csel)
1.387
1.388 s = get_selector(dt, sel)
1.389 -show(sel)
1.390
1.391 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.392 print len(l) == 3, 3, len(l)
1.393 @@ -677,10 +677,10 @@
1.394 dt = (1997, 5, 12, 9, 0, 0)
1.395 l = get_datetime_structure(dt)
1.396 show(l)
1.397 -sel = combine_datetime_with_selectors(dt, sel)
1.398 +csel = combine_datetime_with_selectors(dt, sel)
1.399 +show(csel)
1.400
1.401 s = get_selector(dt, sel)
1.402 -show(sel)
1.403
1.404 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.405 print len(l) == 3, 3, len(l)
1.406 @@ -700,10 +700,10 @@
1.407 dt = (1997, 3, 13, 9, 0, 0)
1.408 l = get_datetime_structure(dt)
1.409 show(l)
1.410 -sel = combine_datetime_with_selectors(dt, sel)
1.411 +csel = combine_datetime_with_selectors(dt, sel)
1.412 +show(csel)
1.413
1.414 s = get_selector(dt, sel)
1.415 -show(sel)
1.416
1.417 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.418 print len(l) == 11, 11, len(l)
1.419 @@ -722,10 +722,10 @@
1.420 dt = (1997, 6, 5, 9, 0, 0)
1.421 l = get_datetime_structure(dt)
1.422 show(l)
1.423 -sel = combine_datetime_with_selectors(dt, sel)
1.424 +csel = combine_datetime_with_selectors(dt, sel)
1.425 +show(csel)
1.426
1.427 s = get_selector(dt, sel)
1.428 -show(sel)
1.429
1.430 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.431 print len(l) == 39, 39, len(l)
1.432 @@ -744,10 +744,10 @@
1.433 dt = (1997, 9, 2, 9, 0, 0)
1.434 l = get_datetime_structure(dt)
1.435 show(l)
1.436 -sel = combine_datetime_with_selectors(dt, sel)
1.437 +csel = combine_datetime_with_selectors(dt, sel)
1.438 +show(csel)
1.439
1.440 s = get_selector(dt, sel)
1.441 -show(sel)
1.442
1.443 l = s.materialise(dt, (2000, 12, 24, 0, 0, 0))
1.444 print len(l) == 6, 6, len(l)
1.445 @@ -766,10 +766,10 @@
1.446 dt = (1997, 9, 13, 9, 0, 0)
1.447 l = get_datetime_structure(dt)
1.448 show(l)
1.449 -sel = combine_datetime_with_selectors(dt, sel)
1.450 +csel = combine_datetime_with_selectors(dt, sel)
1.451 +show(csel)
1.452
1.453 s = get_selector(dt, sel)
1.454 -show(sel)
1.455
1.456 l = s.materialise(dt, (1998, 6, 30, 0, 0, 0))
1.457 print len(l) == 10, 10, len(l)
1.458 @@ -789,10 +789,10 @@
1.459 dt = (1996, 11, 5, 9, 0, 0)
1.460 l = get_datetime_structure(dt)
1.461 show(l)
1.462 -sel = combine_datetime_with_selectors(dt, sel)
1.463 +csel = combine_datetime_with_selectors(dt, sel)
1.464 +show(csel)
1.465
1.466 s = get_selector(dt, sel)
1.467 -show(sel)
1.468
1.469 l = s.materialise(dt, (2004, 12, 24, 0, 0, 0))
1.470 print len(l) == 3, 3, len(l)
1.471 @@ -812,10 +812,10 @@
1.472 dt = (1997, 9, 4, 9, 0, 0)
1.473 l = get_datetime_structure(dt)
1.474 show(l)
1.475 -sel = combine_datetime_with_selectors(dt, sel)
1.476 +csel = combine_datetime_with_selectors(dt, sel)
1.477 +show(csel)
1.478
1.479 s = get_selector(dt, sel)
1.480 -show(sel)
1.481
1.482 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.483 print len(l) == 3, 3, len(l)
1.484 @@ -836,10 +836,10 @@
1.485 dt = (1997, 9, 29, 9, 0, 0)
1.486 l = get_datetime_structure(dt)
1.487 show(l)
1.488 -sel = combine_datetime_with_selectors(dt, sel)
1.489 +csel = combine_datetime_with_selectors(dt, sel)
1.490 +show(csel)
1.491
1.492 s = get_selector(dt, sel)
1.493 -show(sel)
1.494
1.495 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.496 print len(l) == 7, 7, len(l)
1.497 @@ -854,10 +854,10 @@
1.498 dt = (2017, 6, 13)
1.499 l = get_datetime_structure(dt)
1.500 show(l)
1.501 -sel = combine_datetime_with_selectors(dt, sel)
1.502 +csel = combine_datetime_with_selectors(dt, sel)
1.503 +show(csel)
1.504
1.505 s = get_selector(dt, sel)
1.506 -show(sel)
1.507
1.508 l = s.materialise(dt, (2019, 1, 1))
1.509 print len(l) == 37, 37, len(l)
1.510 @@ -871,10 +871,10 @@
1.511 dt = (2017, 6, 13)
1.512 l = get_datetime_structure(dt)
1.513 show(l)
1.514 -sel = combine_datetime_with_selectors(dt, sel)
1.515 +csel = combine_datetime_with_selectors(dt, sel)
1.516 +show(csel)
1.517
1.518 s = get_selector(dt, sel)
1.519 -show(sel)
1.520
1.521 l = s.materialise(dt, (2019, 1, 1))
1.522 print len(l) == 32, 32, len(l)
1.523 @@ -888,10 +888,10 @@
1.524 dt = (2017, 10, 15)
1.525 l = get_datetime_structure(dt)
1.526 show(l)
1.527 -sel = combine_datetime_with_selectors(dt, sel)
1.528 +csel = combine_datetime_with_selectors(dt, sel)
1.529 +show(csel)
1.530
1.531 s = get_selector(dt, sel)
1.532 -show(sel)
1.533
1.534 l = s.materialise(dt, (2018, 1, 1))
1.535 print len(l) == 18, 18, len(l)