diff options
| author | niemeyer <> | 2004-07-16 21:21:22 +0000 |
|---|---|---|
| committer | niemeyer <> | 2004-07-16 21:21:22 +0000 |
| commit | 4da06a4a0d72568fb1f8f640aebacf87b4c30ce0 (patch) | |
| tree | 58fac78309b886afe7a25c5976f20d92bd0dbbdf | |
| parent | 2cf0ef187b382c22737443e036e5eb7244bea423 (diff) | |
| download | dateutil-4da06a4a0d72568fb1f8f640aebacf87b4c30ce0.tar.gz | |
- Removed FREQ_ prefix from frequency constants.
| -rw-r--r-- | README | 216 | ||||
| -rw-r--r-- | dateutil/rrule.py | 96 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test.py | 527 |
4 files changed, 456 insertions, 385 deletions
@@ -52,7 +52,7 @@ import commands import os now = parse(commands.getoutput("date")) today = now.date() -year = rrule(FREQ_YEARLY,bymonth=8,bymonthday=13,byweekday=FR)[0].year +year = rrule(YEARLY,bymonth=8,bymonthday=13,byweekday=FR)[0].year rdelta = relativedelta(easter(year), today) print "Today is:", today print "Year with next Aug 13th on a Friday is:", year @@ -72,8 +72,8 @@ And the Easter of that year is: 2004-04-11 == Download == The following files are available. - * attachment:python-dateutil-0.3.tar.bz2 - * attachment:python-dateutil-0.3-1cl.noarch.rpm + * attachment:python-dateutil-0.5.tar.bz2 + * attachment:python-dateutil-0.5-1cl.noarch.rpm == Author == The dateutil module was written by GustavoNiemeyer <niemeyer@conectiva.com>. @@ -273,14 +273,16 @@ datetime.datetime(1997, 4, 7, 0, 0) How long ago has the millennium changed? {{{ >>> relativedelta(NOW, date(2001,1,1)) -relativedelta(years=+2, months=+8, days=+16, hours=+20, minutes=+54, seconds=+47, microseconds=+282310) +relativedelta(years=+2, months=+8, days=+16, + hours=+20, minutes=+54, seconds=+47, microseconds=+282310) }}} How old is John? {{{ >>> johnbirthday = datetime(1978, 4, 5, 12, 0) >>> relativedelta(NOW, johnbirthday) -relativedelta(years=+25, months=+5, days=+12, hours=+8, minutes=+54, seconds=+47, microseconds=+282310) +relativedelta(years=+25, months=+5, days=+12, + hours=+8, minutes=+54, seconds=+47, microseconds=+282310) }}} It works with dates too. @@ -335,9 +337,9 @@ prototype is: rrule(freq) }}} -Where {{{freq}}} must be one of {{{FREQ_YEARLY}}}, {{{FREQ_MONTHLY}}}, -{{{FREQ_WEEKLY}}}, {{{FREQ_DAILY}}}, {{{FREQ_HOURLY}}}, {{{FREQ_MINUTELY}}}, -or {{{FREQ_SECONDLY}}}. +Where {{{freq}}} must be one of {{{YEARLY}}}, {{{MONTHLY}}}, +{{{WEEKLY}}}, {{{DAILY}}}, {{{HOURLY}}}, {{{MINUTELY}}}, +or {{{SECONDLY}}}. Additionally, it supports the following keyword arguments: @@ -355,8 +357,8 @@ Additionally, it supports the following keyword arguments: interval:: The interval between each {{{freq}}} iteration. For example, - when using {{{FREQ_YEARLY}}}, an interval of {{{2}}} means - once every two years, but with {{{FREQ_HOURLY}}}, it means + when using {{{YEARLY}}}, an interval of {{{2}}} means + once every two years, but with {{{HOURLY}}}, it means once every two hours. The default interval is {{{1}}}. wkst:: @@ -382,7 +384,7 @@ Additionally, it supports the following keyword arguments: specify an occurrence number, corresponding to the nth occurrence of the rule inside the frequency period. For example, a {{{bysetpos}}} of {{{-1}}} if combined with a - {{{FREQ_MONTHLY}}} frequency, and a {{{byweekday}}} of + {{{MONTHLY}}} frequency, and a {{{byweekday}}} of {{{(MO, TU, WE, TH, FR)}}}, will result in the last work day of every month. @@ -413,8 +415,8 @@ Additionally, it supports the following keyword arguments: the recurrence will be applied. It's also possible to use an argument {{{n}}} for the weekday instances, which will mean the {{{n}}}''th'' occurrence of this weekday in the - period. For example, with {{{FREQ_MONTHLY}}}, or with - {{{FREQ_YEARLY}}} and {{{BYMONTH}}}, using {{{FR(+1)}}} + period. For example, with {{{MONTHLY}}}, or with + {{{YEARLY}}} and {{{BYMONTH}}}, using {{{FR(+1)}}} in {{{byweekday}}} will specify the first friday of the month where the recurrence happens. Notice that in the RFC documentation, this is specified as {{{BYDAY}}}, but was @@ -519,7 +521,8 @@ Prepare the environment. Daily, for 10 occurrences. {{{ ->>> list(rrule(FREQ_DAILY, count=10, dtstart=parse("19970902T090000"))) +>>> list(rrule(DAILY, count=10, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 3, 9, 0), datetime.datetime(1997, 9, 4, 9, 0), @@ -534,7 +537,9 @@ Daily, for 10 occurrences. Daily until December 24, 1997 {{{ ->>> list(rrule(FREQ_DAILY, dtstart=parse("19970902T090000"), until=parse("19971224T000000"))) +>>> list(rrule(DAILY, + dtstart=parse("19970902T090000"), + until=parse("19971224T000000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 3, 9, 0), datetime.datetime(1997, 9, 4, 9, 0), @@ -546,7 +551,8 @@ Daily until December 24, 1997 Every other day, 5 occurrences. {{{ ->>> list(rrule(FREQ_DAILY, interval=2, count=5, dtstart=parse("19970902T090000"))) +>>> list(rrule(DAILY, interval=2, count=5, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 4, 9, 0), datetime.datetime(1997, 9, 6, 9, 0), @@ -556,7 +562,8 @@ Every other day, 5 occurrences. Every 10 days, 5 occurrences. {{{ ->>> list(rrule(FREQ_DAILY, interval=10, count=5, dtstart=parse("19970902T090000"))) +>>> list(rrule(DAILY, interval=10, count=5, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 12, 9, 0), datetime.datetime(1997, 9, 22, 9, 0), @@ -566,7 +573,9 @@ Every 10 days, 5 occurrences. Everyday in January, for 3 years. {{{ ->>> list(rrule(FREQ_YEARLY, bymonth=1, byweekday=range(7), dtstart=parse("19980101T090000"), until=parse("20000131T090000"))) +>>> list(rrule(YEARLY, bymonth=1, byweekday=range(7), + dtstart=parse("19980101T090000"), + until=parse("20000131T090000"))) [datetime.datetime(1998, 1, 1, 9, 0), datetime.datetime(1998, 1, 2, 9, 0), (...) @@ -586,13 +595,16 @@ Everyday in January, for 3 years. Same thing, in another way. {{{ ->>> list(rrule(FREQ_DAILY, bymonth=1, dtstart=parse("19980101T090000"), until=parse("20000131T090000"))) +>>> list(rrule(DAILY, bymonth=1, + dtstart=parse("19980101T090000"), + until=parse("20000131T090000"))) (...) }}} Weekly for 10 occurrences. {{{ ->>> list(rrule(FREQ_WEEKLY, count=10, dtstart=parse("19970902T090000"))) +>>> list(rrule(WEEKLY, count=10, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 9, 9, 0), datetime.datetime(1997, 9, 16, 9, 0), @@ -607,7 +619,8 @@ Weekly for 10 occurrences. Every other week, 6 occurrences. {{{ ->>> list(rrule(FREQ_WEEKLY, interval=2, count=6, dtstart=parse("19970902T090000"))) +>>> list(rrule(WEEKLY, interval=2, count=6, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 16, 9, 0), datetime.datetime(1997, 9, 30, 9, 0), @@ -618,8 +631,8 @@ Every other week, 6 occurrences. Weekly on Tuesday and Thursday for 5 weeks. {{{ ->>> list(rrule(FREQ_WEEKLY, count=10, wkst=SU, byweekday=(TU,TH), dtstart=parse( -"19970902T090000"))) +>>> list(rrule(WEEKLY, count=10, wkst=SU, byweekday=(TU,TH), + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 4, 9, 0), datetime.datetime(1997, 9, 9, 9, 0), @@ -634,8 +647,9 @@ Weekly on Tuesday and Thursday for 5 weeks. Every other week on Tuesday and Thursday, for 8 occurrences. {{{ ->>> list(rrule(FREQ_WEEKLY, interval=2, count=8, wkst=SU, byweekday=(TU,TH), dts -tart=parse("19970902T090000"))) +>>> list(rrule(WEEKLY, interval=2, count=8, + wkst=SU, byweekday=(TU,TH), + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 4, 9, 0), datetime.datetime(1997, 9, 16, 9, 0), @@ -648,7 +662,8 @@ tart=parse("19970902T090000"))) Monthly on the 1st Friday for ten occurrences. {{{ ->>> list(rrule(FREQ_MONTHLY, count=10, byweekday=FR(1), dtstart=parse("19970905T090000"))) +>>> list(rrule(MONTHLY, count=10, byweekday=FR(1), + dtstart=parse("19970905T090000"))) [datetime.datetime(1997, 9, 5, 9, 0), datetime.datetime(1997, 10, 3, 9, 0), datetime.datetime(1997, 11, 7, 9, 0), @@ -663,7 +678,9 @@ Monthly on the 1st Friday for ten occurrences. Every other month on the 1st and last Sunday of the month for 10 occurrences. {{{ ->>> list(rrule(FREQ_MONTHLY, interval=2, count=10, byweekday=(SU(1), SU(-1)), dtstart=parse("19970907T090000"))) +>>> list(rrule(MONTHLY, interval=2, count=10, + byweekday=(SU(1), SU(-1)), + dtstart=parse("19970907T090000"))) [datetime.datetime(1997, 9, 7, 9, 0), datetime.datetime(1997, 9, 28, 9, 0), datetime.datetime(1997, 11, 2, 9, 0), @@ -678,7 +695,8 @@ Every other month on the 1st and last Sunday of the month for 10 occurrences. Monthly on the second to last Monday of the month for 6 months. {{{ ->>> list(rrule(FREQ_MONTHLY, count=6, byweekday=MO(-2), dtstart=parse("19970922T090000"))) +>>> list(rrule(MONTHLY, count=6, byweekday=MO(-2), + dtstart=parse("19970922T090000"))) [datetime.datetime(1997, 9, 22, 9, 0), datetime.datetime(1997, 10, 20, 9, 0), datetime.datetime(1997, 11, 17, 9, 0), @@ -689,7 +707,8 @@ Monthly on the second to last Monday of the month for 6 months. Monthly on the third to the last day of the month, for 6 months. {{{ ->>> list(rrule(FREQ_MONTHLY, count=6, bymonthday=-3, dtstart=parse("19970928T090000"))) +>>> list(rrule(MONTHLY, count=6, bymonthday=-3, + dtstart=parse("19970928T090000"))) [datetime.datetime(1997, 9, 28, 9, 0), datetime.datetime(1997, 10, 29, 9, 0), datetime.datetime(1997, 11, 28, 9, 0), @@ -700,7 +719,8 @@ Monthly on the third to the last day of the month, for 6 months. Monthly on the 2nd and 15th of the month for 5 occurrences. {{{ ->>> list(rrule(FREQ_MONTHLY, count=5, bymonthday=(2,15), dtstart=parse("19970902T090000"))) +>>> list(rrule(MONTHLY, count=5, bymonthday=(2,15), + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 15, 9, 0), datetime.datetime(1997, 10, 2, 9, 0), @@ -710,7 +730,8 @@ Monthly on the 2nd and 15th of the month for 5 occurrences. Monthly on the first and last day of the month for 3 occurrences. {{{ ->>> list(rrule(FREQ_MONTHLY, count=5, bymonthday=(-1,1,), dtstart=parse("1997090 +>>> list(rrule(MONTHLY, count=5, bymonthday=(-1,1,), + dtstart=parse("1997090 2T090000"))) [datetime.datetime(1997, 9, 30, 9, 0), datetime.datetime(1997, 10, 1, 9, 0), @@ -721,7 +742,9 @@ Monthly on the first and last day of the month for 3 occurrences. Every 18 months on the 10th thru 15th of the month for 10 occurrences. {{{ ->>> list(rrule(FREQ_MONTHLY, interval=18, count=10, bymonthday=range(10,16), dtstart=parse("19970910T090000"))) +>>> list(rrule(MONTHLY, interval=18, count=10, + bymonthday=range(10,16), + dtstart=parse("19970910T090000"))) [datetime.datetime(1997, 9, 10, 9, 0), datetime.datetime(1997, 9, 11, 9, 0), datetime.datetime(1997, 9, 12, 9, 0), @@ -736,8 +759,8 @@ Every 18 months on the 10th thru 15th of the month for 10 occurrences. Every Tuesday, every other month, 6 occurences. {{{ ->>> list(rrule(FREQ_MONTHLY, interval=2, count=6, byweekday=TU, dtstart=parse("1 -9970902T090000"))) +>>> list(rrule(MONTHLY, interval=2, count=6, byweekday=TU, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 9, 9, 0), datetime.datetime(1997, 9, 16, 9, 0), @@ -748,7 +771,8 @@ Every Tuesday, every other month, 6 occurences. Yearly in June and July for 10 occurrences. {{{ ->>> list(rrule(FREQ_YEARLY, count=4, bymonth=(6,7), dtstart=parse("19970610T0900 +>>> list(rrule(YEARLY, count=4, bymonth=(6,7), + dtstart=parse("19970610T0900 00"))) [datetime.datetime(1997, 6, 10, 9, 0), datetime.datetime(1997, 7, 10, 9, 0), @@ -758,7 +782,8 @@ Yearly in June and July for 10 occurrences. Every 3rd year on the 1st, 100th and 200th day for 4 occurrences. {{{ ->>> list(rrule(FREQ_YEARLY, count=4, interval=3, byyearday=(1,100,200), dtstart=parse("19970101T090000"))) +>>> list(rrule(YEARLY, count=4, interval=3, byyearday=(1,100,200), + dtstart=parse("19970101T090000"))) [datetime.datetime(1997, 1, 1, 9, 0), datetime.datetime(1997, 4, 10, 9, 0), datetime.datetime(1997, 7, 19, 9, 0), @@ -767,7 +792,8 @@ Every 3rd year on the 1st, 100th and 200th day for 4 occurrences. Every 20th Monday of the year, 3 occurrences. {{{ ->>> list(rrule(FREQ_YEARLY, count=3, byweekday=MO(20), dtstart=parse("19970519T090000"))) +>>> list(rrule(YEARLY, count=3, byweekday=MO(20), + dtstart=parse("19970519T090000"))) [datetime.datetime(1997, 5, 19, 9, 0), datetime.datetime(1998, 5, 18, 9, 0), datetime.datetime(1999, 5, 17, 9, 0)] @@ -776,7 +802,8 @@ Every 20th Monday of the year, 3 occurrences. Monday of week number 20 (where the default start of the week is Monday), 3 occurrences. {{{ ->>> list(rrule(FREQ_YEARLY, count=3, byweekno=20, byweekday=MO, dtstart=parse("19970512T090000"))) +>>> list(rrule(YEARLY, count=3, byweekno=20, byweekday=MO, + dtstart=parse("19970512T090000"))) [datetime.datetime(1997, 5, 12, 9, 0), datetime.datetime(1998, 5, 11, 9, 0), datetime.datetime(1999, 5, 17, 9, 0)] @@ -784,7 +811,8 @@ Monday of week number 20 (where the default start of the week is Monday), The week number 1 may be in the last year. {{{ ->>> list(rrule(FREQ_WEEKLY, count=3, byweekno=1, byweekday=MO, dtstart=parse("19970902T090000"))) +>>> list(rrule(WEEKLY, count=3, byweekno=1, byweekday=MO, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 12, 29, 9, 0), datetime.datetime(1999, 1, 4, 9, 0), datetime.datetime(2000, 1, 3, 9, 0)] @@ -792,7 +820,8 @@ The week number 1 may be in the last year. And the week numbers greater than 51 may be in the next year. {{{ ->>> list(rrule(FREQ_WEEKLY, count=3, byweekno=52, byweekday=SU, dtstart=parse("19970902T090000"))) +>>> list(rrule(WEEKLY, count=3, byweekno=52, byweekday=SU, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 12, 28, 9, 0), datetime.datetime(1998, 12, 27, 9, 0), datetime.datetime(2000, 1, 2, 9, 0)] @@ -800,7 +829,8 @@ And the week numbers greater than 51 may be in the next year. Only some years have week number 53: {{{ ->>> list(rrule(FREQ_WEEKLY, count=3, byweekno=53, byweekday=MO, dtstart=parse("19970902T090000"))) +>>> list(rrule(WEEKLY, count=3, byweekno=53, byweekday=MO, + dtstart=parse("19970902T090000"))) [datetime.datetime(1998, 12, 28, 9, 0), datetime.datetime(2004, 12, 27, 9, 0), datetime.datetime(2009, 12, 28, 9, 0)] @@ -808,8 +838,8 @@ Only some years have week number 53: Every Friday the 13th, 4 occurrences. {{{ ->>> list(rrule(FREQ_YEARLY, count=4, byweekday=FR, bymonthday=13, dtstart=parse( -"19970902T090000"))) +>>> list(rrule(YEARLY, count=4, byweekday=FR, bymonthday=13, + dtstart=parse("19970902T090000"))) [datetime.datetime(1998, 2, 13, 9, 0), datetime.datetime(1998, 3, 13, 9, 0), datetime.datetime(1998, 11, 13, 9, 0), @@ -819,7 +849,9 @@ Every Friday the 13th, 4 occurrences. Every four years, the first Tuesday after a Monday in November, 3 occurrences (U.S. Presidential Election day): {{{ ->>> list(rrule(FREQ_YEARLY, interval=4, count=3, bymonth=11, byweekday=TU, bymonthday=(2,3,4,5,6,7,8), dtstart=parse("19961105T090000"))) +>>> list(rrule(YEARLY, interval=4, count=3, bymonth=11, + byweekday=TU, bymonthday=(2,3,4,5,6,7,8), + dtstart=parse("19961105T090000"))) [datetime.datetime(1996, 11, 5, 9, 0), datetime.datetime(2000, 11, 7, 9, 0), datetime.datetime(2004, 11, 2, 9, 0)] @@ -828,7 +860,8 @@ Every four years, the first Tuesday after a Monday in November, The 3rd instance into the month of one of Tuesday, Wednesday or Thursday, for the next 3 months: {{{ ->>> list(rrule(FREQ_MONTHLY, count=3, byweekday=(TU,WE,TH), bysetpos=3, dtstart=parse("19970904T090000"))) +>>> list(rrule(MONTHLY, count=3, byweekday=(TU,WE,TH), + bysetpos=3, dtstart=parse("19970904T090000"))) [datetime.datetime(1997, 9, 4, 9, 0), datetime.datetime(1997, 10, 7, 9, 0), datetime.datetime(1997, 11, 6, 9, 0)] @@ -836,8 +869,8 @@ Thursday, for the next 3 months: The 2nd to last weekday of the month, 3 occurrences. {{{ ->>> list(rrule(FREQ_MONTHLY, count=3, byweekday=(MO,TU,WE,TH,FR), bysetpos=-2, d -tstart=parse("19970929T090000"))) +>>> list(rrule(MONTHLY, count=3, byweekday=(MO,TU,WE,TH,FR), + bysetpos=-2, dtstart=parse("19970929T090000"))) [datetime.datetime(1997, 9, 29, 9, 0), datetime.datetime(1997, 10, 30, 9, 0), datetime.datetime(1997, 11, 27, 9, 0)] @@ -845,7 +878,9 @@ tstart=parse("19970929T090000"))) Every 3 hours from 9:00 AM to 5:00 PM on a specific day. {{{ ->>> list(rrule(FREQ_HOURLY, interval=3, dtstart=parse("19970902T090000"), until=parse("19970902T170000"))) +>>> list(rrule(HOURLY, interval=3, + dtstart=parse("19970902T090000"), + until=parse("19970902T170000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 2, 12, 0), datetime.datetime(1997, 9, 2, 15, 0)] @@ -853,8 +888,8 @@ Every 3 hours from 9:00 AM to 5:00 PM on a specific day. Every 15 minutes for 6 occurrences. {{{ ->>> list(rrule(FREQ_MINUTELY, interval=15, count=6, dtstart=parse("19970902T0900 -00"))) +>>> list(rrule(MINUTELY, interval=15, count=6, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 2, 9, 15), datetime.datetime(1997, 9, 2, 9, 30), @@ -865,8 +900,8 @@ Every 15 minutes for 6 occurrences. Every hour and a half for 4 occurrences. {{{ ->>> list(rrule(FREQ_MINUTELY, interval=90, count=4, dtstart=parse("19970902T0900 -00"))) +>>> list(rrule(MINUTELY, interval=90, count=4, + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 2, 10, 30), datetime.datetime(1997, 9, 2, 12, 0), @@ -875,8 +910,9 @@ Every hour and a half for 4 occurrences. Every 20 minutes from 9:00 AM to 4:40 PM for two days. {{{ ->>> list(rrule(FREQ_MINUTELY, interval=20, count=48, byhour=range(9,17), byminut -e=(0,20,40), dtstart=parse("19970902T090000"))) +>>> list(rrule(MINUTELY, interval=20, count=48, + byhour=range(9,17), byminute=(0,20,40), + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 2, 9, 20), (...) @@ -891,14 +927,17 @@ e=(0,20,40), dtstart=parse("19970902T090000"))) An example where the days generated makes a difference because of {{{wkst}}}. {{{ ->>> list(rrule(FREQ_WEEKLY, interval=2, count=4, byweekday=(TU,SU), wkst=MO, dtstart=parse("19970805T090000"))) +>>> list(rrule(WEEKLY, interval=2, count=4, + byweekday=(TU,SU), wkst=MO, + dtstart=parse("19970805T090000"))) [datetime.datetime(1997, 8, 5, 9, 0), datetime.datetime(1997, 8, 10, 9, 0), datetime.datetime(1997, 8, 19, 9, 0), datetime.datetime(1997, 8, 24, 9, 0)] ->>> list(rrule(FREQ_WEEKLY, interval=2, count=4, byweekday=(TU,SU), wkst=SU, dts -tart=parse("19970805T090000"))) +>>> list(rrule(WEEKLY, interval=2, count=4, + byweekday=(TU,SU), wkst=SU, + dtstart=parse("19970805T090000"))) [datetime.datetime(1997, 8, 5, 9, 0), datetime.datetime(1997, 8, 17, 9, 0), datetime.datetime(1997, 8, 19, 9, 0), @@ -980,8 +1019,10 @@ recurrence set, if possible. Daily, for 7 days, jumping Saturday and Sunday occurrences. {{{ >>> set = rruleset() ->>> set.rrule(rrule(FREQ_DAILY, count=7, dtstart=parse("19970902T090000"))) ->>> set.exrule(rrule(FREQ_YEARLY, byweekday=(SA,SU), dtstart=parse("19970902T090000"))) +>>> set.rrule(rrule(DAILY, count=7, + dtstart=parse("19970902T090000"))) +>>> set.exrule(rrule(YEARLY, byweekday=(SA,SU), + dtstart=parse("19970902T090000"))) >>> list(set) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 3, 9, 0), @@ -993,7 +1034,8 @@ Daily, for 7 days, jumping Saturday and Sunday occurrences. Weekly, for 4 weeks, plus one time on day 7, and not on day 16. {{{ >>> set = rruleset() ->>> set.rrule(rrule(FREQ_WEEKLY, count=4, dtstart=parse("19970902T090000"))) +>>> set.rrule(rrule(WEEKLY, count=4, + dtstart=parse("19970902T090000"))) >>> set.rdate(datetime.datetime(1997, 9, 7, 9, 0)) >>> set.exdate(datetime.datetime(1997, 9, 16, 9, 0)) >>> list(set) @@ -1068,7 +1110,8 @@ Every 10 days, 5 occurrences. Same thing, but passing only the {{{RRULE}}} value. {{{ ->>> list(rrulestr("FREQ=DAILY;INTERVAL=10;COUNT=5", dtstart=parse("19970902T090000"))) +>>> list(rrulestr("FREQ=DAILY;INTERVAL=10;COUNT=5", + dtstart=parse("19970902T090000"))) [datetime.datetime(1997, 9, 2, 9, 0), datetime.datetime(1997, 9, 12, 9, 0), datetime.datetime(1997, 9, 22, 9, 0), @@ -1216,10 +1259,12 @@ Some simple examples based on the {{{date}}} command, using the {{{TZOFFSET}}} dictionary to provide the BRST timezone offset. {{{ >>> parse("Thu Sep 25 10:36:28 BRST 2003", tzinfos=TZOFFSETS) -datetime.datetime(2003, 9, 25, 10, 36, 28, tzinfo=tzoffset('BRST', -10800)) +datetime.datetime(2003, 9, 25, 10, 36, 28, + tzinfo=tzoffset('BRST', -10800)) >>> parse("2003 10:36:28 BRST 25 Sep Thu", tzinfos=TZOFFSETS) -datetime.datetime(2003, 9, 25, 10, 36, 28, tzinfo=tzoffset('BRST', -10800)) +datetime.datetime(2003, 9, 25, 10, 36, 28, + tzinfo=tzoffset('BRST', -10800)) }}} Notice that since BRST is my local timezone, parsing it without @@ -1285,13 +1330,15 @@ datetime.datetime(2003, 9, 25, 0, 0) Another format, based on {{{date -R}}} (RFC822): {{{ >>> parse("Thu, 25 Sep 2003 10:49:41 -0300") -datetime.datetime(2003, 9, 25, 10, 49, 41, tzinfo=tzoffset(None, -10800)) +datetime.datetime(2003, 9, 25, 10, 49, 41, + tzinfo=tzoffset(None, -10800)) }}} ISO format: {{{ >>> parse("2003-09-25T10:49:41.5-03:00") -datetime.datetime(2003, 9, 25, 10, 49, 41, 500000, tzinfo=tzoffset(None, -10800)) +datetime.datetime(2003, 9, 25, 10, 49, 41, 500000, + tzinfo=tzoffset(None, -10800)) }}} Some variations: @@ -1312,10 +1359,12 @@ datetime.datetime(2003, 9, 25, 0, 0) ISO format, without separators: {{{ >>> parse("20030925T104941.5-0300") -datetime.datetime(2003, 9, 25, 10, 49, 41, 500000, tzinfo=tzinfo=tzoffset(None, -10800)) +datetime.datetime(2003, 9, 25, 10, 49, 41, 500000, + tzinfo=tzinfo=tzoffset(None, -10800)) >>> parse("20030925T104941-0300") -datetime.datetime(2003, 9, 25, 10, 49, 41, tzinfo=tzoffset(None, -10800)) +datetime.datetime(2003, 9, 25, 10, 49, 41, + tzinfo=tzoffset(None, -10800)) >>> parse("20030925T104941") datetime.datetime(2003, 9, 25, 10, 49, 41) @@ -1439,7 +1488,8 @@ Fuzzy parsing: >>> s = "Today is 25 of September of 2003, exactly " \ ... "at 10:49:41 with timezone -03:00." >>> parse(s, fuzzy=True) -datetime.datetime(2003, 9, 25, 10, 49, 41, tzinfo=tzoffset(None, -10800)) +datetime.datetime(2003, 9, 25, 10, 49, 41, + tzinfo=tzoffset(None, -10800)) }}} Other random formats: @@ -1541,13 +1591,15 @@ The {{{name}}} parameter may be optionally set to {{{None}}}, and >>> from dateutil.tz import * >>> datetime.now(tzoffset("BRST", -10800)) -datetime.datetime(2003, 9, 27, 9, 52, 43, 624904, tzinfo=tzinfo=tzoffset('BRST', -10800)) +datetime.datetime(2003, 9, 27, 9, 52, 43, 624904, + tzinfo=tzinfo=tzoffset('BRST', -10800)) >>> datetime.now(tzoffset("BRST", -10800)).tzname() 'BRST' >>> datetime.now(tzoffset("BRST", -10800)).astimezone(tzutc()) -datetime.datetime(2003, 9, 27, 12, 53, 11, 446419, tzinfo=tzutc()) +datetime.datetime(2003, 9, 27, 12, 53, 11, 446419, + tzinfo=tzutc()) }}} ==== tzlocal type ==== @@ -1561,13 +1613,15 @@ parameters. >>> from dateutil.tz import * >>> datetime.now(tzlocal()) -datetime.datetime(2003, 9, 27, 10, 1, 43, 673605, tzinfo=tzlocal()) +datetime.datetime(2003, 9, 27, 10, 1, 43, 673605, + tzinfo=tzlocal()) >>> datetime.now(tzlocal()).tzname() 'BRST' >>> datetime.now(tzlocal()).astimezone(tzoffset(None, 0)) -datetime.datetime(2003, 9, 27, 13, 3, 0, 11493, tzinfo=tzoffset(None, 0)) +datetime.datetime(2003, 9, 27, 13, 3, 0, 11493, + tzinfo=tzoffset(None, 0)) }}} ==== tzstr type ==== @@ -1649,7 +1703,8 @@ instead of timezone strings, information is passed using {{{relativedelta}}}s which are applied to a datetime set to the first day of the year. Here is the prototype of this type's constructor: {{{ -tzrange(stdabbr, stdoffset=None, dstabbr=None, dstoffset=None, start=None, end=None): +tzrange(stdabbr, stdoffset=None, dstabbr=None, dstoffset=None, + start=None, end=None): }}} Offsets must be given in seconds. Information not provided will be @@ -1663,8 +1718,10 @@ True >>> from dateutil.relativedelta import * >>> range1 = tzrange("EST", -18000, "EDT") >>> range2 = tzrange("EST", -18000, "EDT", -14400, -... relativedelta(hours=+2, month=4, day=1, weekday=SU(+1)), -... relativedelta(hours=+1, month=10, day=31, weekday=SU(-1)))>>> tzstr('EST5EDT') == range1 == range2 +... relativedelta(hours=+2, month=4, day=1, + weekday=SU(+1)), +... relativedelta(hours=+1, month=10, day=31, + weekday=SU(-1))) >>> tzstr('EST5EDT') == range1 == range2 True }}} @@ -1693,10 +1750,12 @@ a {{{read()}}} method. {{{ >>> tz = tzfile("/etc/localtime") >>> datetime.now(tz) -datetime.datetime(2003, 9, 27, 12, 3, 48, 392138, tzinfo=tzfile('/etc/localtime')) +datetime.datetime(2003, 9, 27, 12, 3, 48, 392138, + tzinfo=tzfile('/etc/localtime')) >>> datetime.now(tz).astimezone(tzutc()) -datetime.datetime(2003, 9, 27, 15, 3, 53, 70863, tzinfo=tzutc()) +datetime.datetime(2003, 9, 27, 15, 3, 53, 70863, + tzinfo=tzutc()) >>> datetime.now(tz).tzname() 'BRST' @@ -1776,7 +1835,8 @@ And here is an example exploring a {{{tzical}}} type: <tzicalvtz 'US-Eastern'> >>> datetime.now(est) -datetime.datetime(2003, 10, 6, 19, 44, 18, 667987, tzinfo=<tzicalvtz 'US-Eastern'>) +datetime.datetime(2003, 10, 6, 19, 44, 18, 667987, + tzinfo=<tzicalvtz 'US-Eastern'>) >>> est == tz.get() True diff --git a/dateutil/rrule.py b/dateutil/rrule.py index b0a3772..cd7375f 100644 --- a/dateutil/rrule.py +++ b/dateutil/rrule.py @@ -14,8 +14,8 @@ import thread import sys __all__ = ["rrule", "rruleset", "rrulestr", - "FREQ_YEARLY", "FREQ_MONTHLY", "FREQ_WEEKLY", "FREQ_DAILY", - "FREQ_HOURLY", "FREQ_MINUTELY", "FREQ_SECONDLY", + "YEARLY", "MONTHLY", "WEEKLY", "DAILY", + "HOURLY", "MINUTELY", "SECONDLY", "MO", "TU", "WE", "TH", "FR", "SA", "SU"] # Every mask is 7 days longer to handle cross-year weekly periods. @@ -35,13 +35,13 @@ del M29, M30, M31, M365MASK[59], MDAY365MASK[59], NMDAY365MASK[31] MDAY365MASK = tuple(MDAY365MASK) M365MASK = tuple(M365MASK) -(FREQ_YEARLY, - FREQ_MONTHLY, - FREQ_WEEKLY, - FREQ_DAILY, - FREQ_HOURLY, - FREQ_MINUTELY, - FREQ_SECONDLY) = range(7) +(YEARLY, + MONTHLY, + WEEKLY, + DAILY, + HOURLY, + MINUTELY, + SECONDLY) = range(7) # Imported on demand. easter = None @@ -258,13 +258,13 @@ class rrule(rrulebase): self._bysetpos = tuple(bysetpos) if not (byweekno or byyearday or bymonthday or byweekday is not None or byeaster is not None): - if freq == FREQ_YEARLY: + if freq == YEARLY: if not bymonth: bymonth = dtstart.month bymonthday = dtstart.day - elif freq == FREQ_MONTHLY: + elif freq == MONTHLY: bymonthday = dtstart.day - elif freq == FREQ_WEEKLY: + elif freq == WEEKLY: byweekday = dtstart.weekday() # bymonth if not bymonth: @@ -319,7 +319,7 @@ class rrule(rrulebase): self._byweekday = (byweekday,) self._bynweekday = None elif hasattr(byweekday, "n"): - if byweekday.n == 0 or freq > FREQ_MONTHLY: + if byweekday.n == 0 or freq > MONTHLY: self._byweekday = (byweekday.weekday,) self._bynweekday = None else: @@ -331,7 +331,7 @@ class rrule(rrulebase): for wday in byweekday: if type(wday) is int: self._byweekday.append(wday) - elif wday.n == 0 or freq > FREQ_MONTHLY: + elif wday.n == 0 or freq > MONTHLY: self._byweekday.append(wday.weekday) else: self._bynweekday.append((wday.weekday, wday.n)) @@ -343,7 +343,7 @@ class rrule(rrulebase): self._bynweekday = None # byhour if byhour is None: - if freq < FREQ_HOURLY: + if freq < HOURLY: self._byhour = (dtstart.hour,) else: self._byhour = None @@ -353,7 +353,7 @@ class rrule(rrulebase): self._byhour = tuple(byhour) # byminute if byminute is None: - if freq < FREQ_MINUTELY: + if freq < MINUTELY: self._byminute = (dtstart.minute,) else: self._byminute = None @@ -363,7 +363,7 @@ class rrule(rrulebase): self._byminute = tuple(byminute) # bysecond if bysecond is None: - if freq < FREQ_SECONDLY: + if freq < SECONDLY: self._bysecond = (dtstart.second,) else: self._bysecond = None @@ -372,7 +372,7 @@ class rrule(rrulebase): else: self._bysecond = tuple(bysecond) - if self._freq >= FREQ_HOURLY: + if self._freq >= HOURLY: self._timeset = None else: self._timeset = [] @@ -409,25 +409,25 @@ class rrule(rrulebase): ii = _iterinfo(self) ii.rebuild(year, month) - getdayset = {FREQ_YEARLY:ii.ydayset, - FREQ_MONTHLY:ii.mdayset, - FREQ_WEEKLY:ii.wdayset, - FREQ_DAILY:ii.ddayset, - FREQ_HOURLY:ii.ddayset, - FREQ_MINUTELY:ii.ddayset, - FREQ_SECONDLY:ii.ddayset}[freq] + getdayset = {YEARLY:ii.ydayset, + MONTHLY:ii.mdayset, + WEEKLY:ii.wdayset, + DAILY:ii.ddayset, + HOURLY:ii.ddayset, + MINUTELY:ii.ddayset, + SECONDLY:ii.ddayset}[freq] - if freq < FREQ_HOURLY: + if freq < HOURLY: timeset = self._timeset else: - gettimeset = {FREQ_HOURLY:ii.htimeset, - FREQ_MINUTELY:ii.mtimeset, - FREQ_SECONDLY:ii.stimeset}[freq] - if ((freq >= FREQ_HOURLY and + gettimeset = {HOURLY:ii.htimeset, + MINUTELY:ii.mtimeset, + SECONDLY:ii.stimeset}[freq] + if ((freq >= HOURLY and self._byhour and hour not in self._byhour) or - (freq >= FREQ_MINUTELY and + (freq >= MINUTELY and self._byminute and minute not in self._byminute) or - (freq >= FREQ_SECONDLY and + (freq >= SECONDLY and self._bysecond and minute not in self._bysecond)): timeset = () else: @@ -506,13 +506,13 @@ class rrule(rrulebase): # Handle frequency and interval fixday = False - if freq == FREQ_YEARLY: + if freq == YEARLY: year += interval if year > datetime.MAXYEAR: self._len = total return ii.rebuild(year, month) - elif freq == FREQ_MONTHLY: + elif freq == MONTHLY: month += interval if month > 12: div, mod = divmod(month, 12) @@ -525,17 +525,17 @@ class rrule(rrulebase): self._len = total return ii.rebuild(year, month) - elif freq == FREQ_WEEKLY: + elif freq == WEEKLY: if wkst > weekday: day += -(weekday+1+(6-wkst))+self._interval*7 else: day += -(weekday-wkst)+self._interval*7 weekday = wkst fixday = True - elif freq == FREQ_DAILY: + elif freq == DAILY: day += interval fixday = True - elif freq == FREQ_HOURLY: + elif freq == HOURLY: if filtered: # Jump to one iteration before next day hour += ((23-hour)//interval)*interval @@ -549,7 +549,7 @@ class rrule(rrulebase): if not byhour or hour in byhour: break timeset = gettimeset(hour, minute, second) - elif freq == FREQ_MINUTELY: + elif freq == MINUTELY: if filtered: # Jump to one iteration before next day minute += ((1439-(hour*60+minute))//interval)*interval @@ -569,7 +569,7 @@ class rrule(rrulebase): (not byminute or minute in byminute)): break timeset = gettimeset(hour, minute, second) - elif freq == FREQ_SECONDLY: + elif freq == SECONDLY: if filtered: # Jump to one iteration before next day second += (((86399-(hour*3600+minute*60+second)) @@ -717,13 +717,13 @@ class _iterinfo(object): if (rr._bynweekday and (month != self.lastmonth or year != self.lastyear)): ranges = [] - if rr._freq == FREQ_YEARLY: + if rr._freq == YEARLY: if rr._bymonth: for month in rr._bymonth: ranges.append(self.mrange[month-1:month+1]) else: ranges = [(0, self.yearlen)] - elif rr._freq == FREQ_MONTHLY: + elif rr._freq == MONTHLY: ranges = [self.mrange[month-1:month+1]] if ranges: # Weekly frequency won't get here, so we may not @@ -875,13 +875,13 @@ class rruleset(rrulebase): class _rrulestr: - _freq_map = {"YEARLY": FREQ_YEARLY, - "MONTHLY": FREQ_MONTHLY, - "WEEKLY": FREQ_WEEKLY, - "DAILY": FREQ_DAILY, - "HOURLY": FREQ_HOURLY, - "MINUTELY": FREQ_MINUTELY, - "SECONDLY": FREQ_SECONDLY} + _freq_map = {"YEARLY": YEARLY, + "MONTHLY": MONTHLY, + "WEEKLY": WEEKLY, + "DAILY": DAILY, + "HOURLY": HOURLY, + "MINUTELY": MINUTELY, + "SECONDLY": SECONDLY} _weekday_map = {"MO":0,"TU":1,"WE":2,"TH":3,"FR":4,"SA":5,"SU":6} @@ -2,7 +2,7 @@ from distutils.core import setup setup(name="python-dateutil", - version = "0.4", + version = "0.5", description = "Extensions to the standard python 2.3+ datetime module", author = "Gustavo Niemeyer", author_email = "niemeyer@conectiva.com", @@ -142,7 +142,7 @@ class RelativeDeltaTest(unittest.TestCase): class RRuleTest(unittest.TestCase): def testYearly(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -150,7 +150,7 @@ class RRuleTest(unittest.TestCase): datetime(1999, 9, 2, 9, 0)]) def testYearlyInterval(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -159,7 +159,7 @@ class RRuleTest(unittest.TestCase): datetime(2001, 9, 2, 9, 0)]) def testYearlyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, interval=100, dtstart=parse("19970902T090000"))), @@ -168,7 +168,7 @@ class RRuleTest(unittest.TestCase): datetime(2197, 9, 2, 9, 0)]) def testYearlyByMonth(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -177,7 +177,7 @@ class RRuleTest(unittest.TestCase): datetime(1999, 1, 2, 9, 0)]) def testYearlyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -186,7 +186,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 3, 9, 0)]) def testYearlyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -196,7 +196,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 5, 9, 0)]) def testYearlyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -205,7 +205,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0)]) def testYearlyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -214,7 +214,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 12, 31, 9, 0)]) def testYearlyByNWeekDayLarge(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekday=(TU(3),TH(-3)), dtstart=parse("19970902T090000"))), @@ -223,7 +223,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 12, 17, 9, 0)]) def testYearlyByMonthAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -233,7 +233,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 8, 9, 0)]) def testYearlyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -245,7 +245,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndNWeekDayLarge(self): # This is interesting because the TH(-3) ends up before # the TU(3). - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(1,3), byweekday=(TU(3),TH(-3)), @@ -255,7 +255,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 12, 9, 0)]) def testYearlyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -265,7 +265,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 3, 9, 0)]) def testYearlyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -276,7 +276,7 @@ class RRuleTest(unittest.TestCase): datetime(2001, 3, 1, 9, 0)]) def testYearlyByYearDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -285,7 +285,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 7, 19, 9, 0)]) def testYearlyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=(4,7), byyearday=(1,100,200), @@ -295,7 +295,7 @@ class RRuleTest(unittest.TestCase): datetime(1999, 4, 10, 9, 0)]) def testYearlyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -306,7 +306,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByWeekNoAndWeekDay(self): # That's a nice one. The first days of week number one # may be in the last year. - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekno=1, byweekday=MO, @@ -318,7 +318,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByWeekNoAndWeekDayLarge(self): # Another nice test. The last days of week number 52/53 # may be in the next year. - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekno=52, byweekday=SU, @@ -328,7 +328,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testYearlyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekno=-1, byweekday=SU, @@ -338,7 +338,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testYearlyByEaster(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -347,7 +347,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 23, 9, 0)]) def testYearlyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -356,7 +356,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 24, 9, 0)]) def testYearlyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -365,7 +365,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 22, 9, 0)]) def testYearlyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekno=53, byweekday=MO, @@ -375,7 +375,7 @@ class RRuleTest(unittest.TestCase): datetime(2009, 12, 28, 9, 0)]) def testYearlyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byweekno=53, byweekday=MO, @@ -385,7 +385,7 @@ class RRuleTest(unittest.TestCase): datetime(2009, 12, 28, 9, 0)]) def testYearlyByHour(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -394,7 +394,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 9, 2, 18, 0)]) def testYearlyByMinute(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -403,7 +403,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 9, 2, 9, 6)]) def testYearlyBySecond(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -412,7 +412,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 9, 2, 9, 0, 6)]) def testYearlyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byhour=(6,18), byminute=(6,18), @@ -422,7 +422,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 9, 2, 6, 6)]) def testYearlyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byhour=(6,18), bysecond=(6,18), @@ -432,7 +432,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 9, 2, 6, 0, 6)]) def testYearlyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byminute=(6,18), bysecond=(6,18), @@ -442,7 +442,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testYearlyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, byhour=(6,18), byminute=(6,18), @@ -453,7 +453,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testYearlyBySetPos(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonthday=15, byhour=(6,18), @@ -464,7 +464,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 11, 15, 18, 0)]) def testMonthly(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -472,7 +472,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 11, 2, 9, 0)]) def testMonthlyInterval(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -481,7 +481,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 2, 9, 0)]) def testMonthlyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, interval=18, dtstart=parse("19970902T090000"))), @@ -490,7 +490,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 9, 2, 9, 0)]) def testMonthlyByMonth(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -500,7 +500,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -509,7 +509,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 3, 9, 0)]) def testMonthlyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -519,7 +519,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 5, 9, 0)]) def testMonthlyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -528,7 +528,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0)]) def testMonthlyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -537,7 +537,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 7, 9, 0)]) def testMonthlyByNWeekDayLarge(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekday=(TU(3),TH(-3)), dtstart=parse("19970902T090000"))), @@ -546,7 +546,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 16, 9, 0)]) def testMonthlyByMonthAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -556,7 +556,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 8, 9, 0)]) def testMonthlyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -566,7 +566,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 3, 9, 0)]) def testMonthlyByMonthAndNWeekDayLarge(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(1,3), byweekday=(TU(3),TH(-3)), @@ -576,7 +576,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 12, 9, 0)]) def testMonthlyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -586,7 +586,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 3, 9, 0)]) def testMonthlyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -597,7 +597,7 @@ class RRuleTest(unittest.TestCase): datetime(2001, 3, 1, 9, 0)]) def testMonthlyByYearDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -606,7 +606,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 7, 19, 9, 0)]) def testMonthlyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonth=(4,7), byyearday=(1,100,200), @@ -616,7 +616,7 @@ class RRuleTest(unittest.TestCase): datetime(1999, 4, 10, 9, 0)]) def testMonthlyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -627,7 +627,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByWeekNoAndWeekDay(self): # That's a nice one. The first days of week number one # may be in the last year. - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekno=1, byweekday=MO, @@ -639,7 +639,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByWeekNoAndWeekDayLarge(self): # Another nice test. The last days of week number 52/53 # may be in the next year. - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekno=52, byweekday=SU, @@ -649,7 +649,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testMonthlyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekno=-1, byweekday=SU, @@ -659,7 +659,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testMonthlyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byweekno=53, byweekday=MO, @@ -669,7 +669,7 @@ class RRuleTest(unittest.TestCase): datetime(2009, 12, 28, 9, 0)]) def testMonthlyByEaster(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -678,7 +678,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 23, 9, 0)]) def testMonthlyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -687,7 +687,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 24, 9, 0)]) def testMonthlyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -696,7 +696,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 22, 9, 0)]) def testMonthlyByHour(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -705,7 +705,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 2, 18, 0)]) def testMonthlyByMinute(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -714,7 +714,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 2, 9, 6)]) def testMonthlyBySecond(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -723,7 +723,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 2, 9, 0, 6)]) def testMonthlyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byhour=(6,18), byminute=(6,18), @@ -733,7 +733,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 2, 6, 6)]) def testMonthlyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byhour=(6,18), bysecond=(6,18), @@ -743,7 +743,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 2, 6, 0, 6)]) def testMonthlyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byminute=(6,18), bysecond=(6,18), @@ -753,7 +753,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testMonthlyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, byhour=(6,18), byminute=(6,18), @@ -764,7 +764,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testMonthlyBySetPos(self): - self.assertEqual(list(rrule(FREQ_MONTHLY, + self.assertEqual(list(rrule(MONTHLY, count=3, bymonthday=(13,17), byhour=(6,18), @@ -775,7 +775,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 13, 18, 0)]) def testWeekly(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -783,7 +783,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 16, 9, 0)]) def testWeeklyInterval(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -792,7 +792,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 30, 9, 0)]) def testWeeklyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, interval=20, dtstart=parse("19970902T090000"))), @@ -801,7 +801,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 6, 9, 9, 0)]) def testWeeklyByMonth(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -810,7 +810,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 20, 9, 0)]) def testWeeklyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -819,7 +819,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 3, 9, 0)]) def testWeeklyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -829,7 +829,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 5, 9, 0)]) def testWeeklyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -838,7 +838,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0)]) def testWeeklyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -850,7 +850,7 @@ class RRuleTest(unittest.TestCase): # This test is interesting, because it crosses the year # boundary in a weekly period to find day '1' as a # valid recurrence. - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -860,7 +860,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 8, 9, 0)]) def testWeeklyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -870,7 +870,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 8, 9, 0)]) def testWeeklyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -880,7 +880,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 3, 9, 0)]) def testWeeklyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -891,7 +891,7 @@ class RRuleTest(unittest.TestCase): datetime(2001, 3, 1, 9, 0)]) def testWeeklyByYearDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -900,7 +900,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 7, 19, 9, 0)]) def testWeeklyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bymonth=(1,7), byyearday=(1,100,200), @@ -910,7 +910,7 @@ class RRuleTest(unittest.TestCase): datetime(1999, 1, 1, 9, 0)]) def testWeeklyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -921,7 +921,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByWeekNoAndWeekDay(self): # That's a nice one. The first days of week number one # may be in the last year. - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekno=1, byweekday=MO, @@ -933,7 +933,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByWeekNoAndWeekDayLarge(self): # Another nice test. The last days of week number 52/53 # may be in the next year. - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekno=52, byweekday=SU, @@ -943,7 +943,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testWeeklyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekno=-1, byweekday=SU, @@ -953,7 +953,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testWeeklyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekno=53, byweekday=MO, @@ -963,7 +963,7 @@ class RRuleTest(unittest.TestCase): datetime(2009, 12, 28, 9, 0)]) def testWeeklyByEaster(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -972,7 +972,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 23, 9, 0)]) def testWeeklyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -981,7 +981,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 24, 9, 0)]) def testWeeklyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -990,7 +990,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 22, 9, 0)]) def testWeeklyByHour(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -999,7 +999,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 18, 0)]) def testWeeklyByMinute(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -1008,7 +1008,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 6)]) def testWeeklyBySecond(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -1017,7 +1017,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0, 6)]) def testWeeklyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byhour=(6,18), byminute=(6,18), @@ -1027,7 +1027,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 6, 6)]) def testWeeklyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byhour=(6,18), bysecond=(6,18), @@ -1037,7 +1037,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 6, 0, 6)]) def testWeeklyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byminute=(6,18), bysecond=(6,18), @@ -1047,7 +1047,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testWeeklyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byhour=(6,18), byminute=(6,18), @@ -1058,7 +1058,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testWeeklyBySetPos(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, byweekday=(TU,TH), byhour=(6,18), @@ -1069,7 +1069,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 18, 0)]) def testDaily(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -1077,7 +1077,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 9, 0)]) def testDailyInterval(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -1086,7 +1086,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 6, 9, 0)]) def testDailyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, interval=92, dtstart=parse("19970902T090000"))), @@ -1095,7 +1095,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 5, 9, 0)]) def testDailyByMonth(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -1104,7 +1104,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 3, 9, 0)]) def testDailyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -1113,7 +1113,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 10, 3, 9, 0)]) def testDailyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -1123,7 +1123,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 5, 9, 0)]) def testDailyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -1132,7 +1132,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0)]) def testDailyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -1141,7 +1141,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0)]) def testDailyByMonthAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -1151,7 +1151,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 8, 9, 0)]) def testDailyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -1161,7 +1161,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 8, 9, 0)]) def testDailyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -1171,7 +1171,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 3, 3, 9, 0)]) def testDailyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -1182,7 +1182,7 @@ class RRuleTest(unittest.TestCase): datetime(2001, 3, 1, 9, 0)]) def testDailyByYearDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -1191,7 +1191,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 7, 19, 9, 0)]) def testDailyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bymonth=(1,7), byyearday=(1,100,200), @@ -1201,7 +1201,7 @@ class RRuleTest(unittest.TestCase): datetime(1999, 1, 1, 9, 0)]) def testDailyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -1212,7 +1212,7 @@ class RRuleTest(unittest.TestCase): def testDailyByWeekNoAndWeekDay(self): # That's a nice one. The first days of week number one # may be in the last year. - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekno=1, byweekday=MO, @@ -1224,7 +1224,7 @@ class RRuleTest(unittest.TestCase): def testDailyByWeekNoAndWeekDayLarge(self): # Another nice test. The last days of week number 52/53 # may be in the next year. - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekno=52, byweekday=SU, @@ -1234,7 +1234,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testDailyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekno=-1, byweekday=SU, @@ -1244,7 +1244,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 1, 2, 9, 0)]) def testDailyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byweekno=53, byweekday=MO, @@ -1254,7 +1254,7 @@ class RRuleTest(unittest.TestCase): datetime(2009, 12, 28, 9, 0)]) def testDailyByEaster(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -1263,7 +1263,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 23, 9, 0)]) def testDailyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -1272,7 +1272,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 24, 9, 0)]) def testDailyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -1281,7 +1281,7 @@ class RRuleTest(unittest.TestCase): datetime(2000, 4, 22, 9, 0)]) def testDailyByHour(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -1290,7 +1290,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 18, 0)]) def testDailyByMinute(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -1299,7 +1299,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 9, 6)]) def testDailyBySecond(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -1308,7 +1308,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 9, 0, 6)]) def testDailyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byhour=(6,18), byminute=(6,18), @@ -1318,7 +1318,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 6, 6)]) def testDailyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byhour=(6,18), bysecond=(6,18), @@ -1328,7 +1328,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 6, 0, 6)]) def testDailyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byminute=(6,18), bysecond=(6,18), @@ -1338,7 +1338,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testDailyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byhour=(6,18), byminute=(6,18), @@ -1349,7 +1349,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testDailyBySetPos(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, byhour=(6,18), byminute=(15,45), @@ -1360,7 +1360,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 18, 15)]) def testHourly(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -1368,7 +1368,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 11, 0)]) def testHourlyInterval(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -1377,7 +1377,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 13, 0)]) def testHourlyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, interval=769, dtstart=parse("19970902T090000"))), @@ -1386,7 +1386,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 11, 5, 11, 0)]) def testHourlyByMonth(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -1395,7 +1395,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 2, 0)]) def testHourlyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -1404,7 +1404,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 2, 0)]) def testHourlyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -1414,7 +1414,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 5, 2, 0)]) def testHourlyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -1423,7 +1423,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 11, 0)]) def testHourlyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -1432,7 +1432,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 11, 0)]) def testHourlyByMonthAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -1442,7 +1442,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 2, 0)]) def testHourlyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -1452,7 +1452,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 2, 0)]) def testHourlyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -1462,7 +1462,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 2, 0)]) def testHourlyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -1473,7 +1473,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 2, 0)]) def testHourlyByYearDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -1482,7 +1482,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 2, 0)]) def testHourlyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bymonth=(4,7), byyearday=(1,100,200), @@ -1492,7 +1492,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 10, 2, 0)]) def testHourlyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -1501,7 +1501,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 5, 11, 2, 0)]) def testHourlyByWeekNoAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekno=1, byweekday=MO, @@ -1511,7 +1511,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 29, 2, 0)]) def testHourlyByWeekNoAndWeekDayLarge(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekno=52, byweekday=SU, @@ -1521,7 +1521,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 28, 2, 0)]) def testHourlyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekno=-1, byweekday=SU, @@ -1531,7 +1531,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 28, 2, 0)]) def testHourlyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byweekno=53, byweekday=MO, @@ -1541,7 +1541,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 12, 28, 2, 0)]) def testHourlyByEaster(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -1550,7 +1550,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 12, 2, 0)]) def testHourlyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -1559,7 +1559,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 13, 2, 0)]) def testHourlyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -1568,7 +1568,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 11, 2, 0)]) def testHourlyByHour(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -1577,7 +1577,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 18, 0)]) def testHourlyByMinute(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -1586,7 +1586,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 10, 6)]) def testHourlyBySecond(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -1595,7 +1595,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 10, 0, 6)]) def testHourlyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byhour=(6,18), byminute=(6,18), @@ -1605,7 +1605,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 6, 6)]) def testHourlyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byhour=(6,18), bysecond=(6,18), @@ -1615,7 +1615,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 6, 0, 6)]) def testHourlyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byminute=(6,18), bysecond=(6,18), @@ -1625,7 +1625,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testHourlyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byhour=(6,18), byminute=(6,18), @@ -1636,7 +1636,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testHourlyBySetPos(self): - self.assertEqual(list(rrule(FREQ_HOURLY, + self.assertEqual(list(rrule(HOURLY, count=3, byminute=(15,45), bysecond=(15,45), @@ -1647,7 +1647,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 10, 15, 45)]) def testMinutely(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -1655,7 +1655,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 2)]) def testMinutelyInterval(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -1664,7 +1664,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 4)]) def testMinutelyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, interval=1501, dtstart=parse("19970902T090000"))), @@ -1673,7 +1673,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 11, 2)]) def testMinutelyByMonth(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -1682,7 +1682,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 2)]) def testMinutelyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -1691,7 +1691,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 0, 2)]) def testMinutelyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -1701,7 +1701,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 5, 0, 2)]) def testMinutelyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -1710,7 +1710,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 2)]) def testMinutelyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -1719,7 +1719,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 2)]) def testMinutelyByMonthAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -1729,7 +1729,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 2)]) def testMinutelyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -1739,7 +1739,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 2)]) def testMinutelyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -1749,7 +1749,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 2)]) def testMinutelyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -1760,7 +1760,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 2)]) def testMinutelyByYearDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -1769,7 +1769,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 2)]) def testMinutelyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bymonth=(4,7), byyearday=(1,100,200), @@ -1779,7 +1779,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 10, 0, 2)]) def testMinutelyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -1788,7 +1788,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 5, 11, 0, 2)]) def testMinutelyByWeekNoAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekno=1, byweekday=MO, @@ -1798,7 +1798,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 29, 0, 2)]) def testMinutelyByWeekNoAndWeekDayLarge(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekno=52, byweekday=SU, @@ -1808,7 +1808,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 28, 0, 2)]) def testMinutelyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekno=-1, byweekday=SU, @@ -1818,7 +1818,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 28, 0, 2)]) def testMinutelyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byweekno=53, byweekday=MO, @@ -1828,7 +1828,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 12, 28, 0, 2)]) def testMinutelyByEaster(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -1837,7 +1837,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 12, 0, 2)]) def testMinutelyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -1846,7 +1846,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 13, 0, 2)]) def testMinutelyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -1855,7 +1855,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 11, 0, 2)]) def testMinutelyByHour(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -1864,7 +1864,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 2)]) def testMinutelyByMinute(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -1873,7 +1873,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 10, 6)]) def testMinutelyBySecond(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -1882,7 +1882,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 1, 6)]) def testMinutelyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byhour=(6,18), byminute=(6,18), @@ -1892,7 +1892,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 6, 6)]) def testMinutelyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byhour=(6,18), bysecond=(6,18), @@ -1902,7 +1902,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 1, 6)]) def testMinutelyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byminute=(6,18), bysecond=(6,18), @@ -1912,7 +1912,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testMinutelyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, byhour=(6,18), byminute=(6,18), @@ -1923,7 +1923,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testMinutelyBySetPos(self): - self.assertEqual(list(rrule(FREQ_MINUTELY, + self.assertEqual(list(rrule(MINUTELY, count=3, bysecond=(15,30,45), bysetpos=(3,-3), @@ -1933,7 +1933,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 1, 15)]) def testSecondly(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 0), @@ -1941,7 +1941,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 0, 2)]) def testSecondlyInterval(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, interval=2, dtstart=parse("19970902T090000"))), @@ -1950,7 +1950,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 0, 4)]) def testSecondlyIntervalLarge(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, interval=90061, dtstart=parse("19970902T090000"))), @@ -1959,7 +1959,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 11, 2, 2)]) def testSecondlyByMonth(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonth=(1,3), dtstart=parse("19970902T090000"))), @@ -1968,7 +1968,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 0, 2)]) def testSecondlyByMonthDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonthday=(1,3), dtstart=parse("19970902T090000"))), @@ -1977,7 +1977,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 3, 0, 0, 2)]) def testSecondlyByMonthAndMonthDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonth=(1,3), bymonthday=(5,7), @@ -1987,7 +1987,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 5, 0, 0, 2)]) def testSecondlyByWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekday=(TU,TH), dtstart=parse("19970902T090000"))), @@ -1996,7 +1996,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 0, 2)]) def testSecondlyByNWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekday=(TU(1),TH(-1)), dtstart=parse("19970902T090000"))), @@ -2005,7 +2005,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 0, 2)]) def testSecondlyByMonthAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonth=(1,3), byweekday=(TU,TH), @@ -2015,7 +2015,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 0, 2)]) def testSecondlyByMonthAndNWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonth=(1,3), byweekday=(TU(1),TH(-1)), @@ -2025,7 +2025,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 0, 2)]) def testSecondlyByMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonthday=(1,3), byweekday=(TU,TH), @@ -2035,7 +2035,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 0, 2)]) def testSecondlyByMonthAndMonthDayAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonth=(1,3), bymonthday=(1,3), @@ -2046,7 +2046,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 0, 2)]) def testSecondlyByYearDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byyearday=(1,100,200), dtstart=parse("19970902T090000"))), @@ -2055,7 +2055,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 1, 1, 0, 0, 2)]) def testSecondlyByMonthAndYearDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bymonth=(4,7), byyearday=(1,100,200), @@ -2065,7 +2065,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 10, 0, 0, 2)]) def testSecondlyByWeekNo(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekno=20, dtstart=parse("19970902T090000"))), @@ -2074,7 +2074,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 5, 11, 0, 0, 2)]) def testSecondlyByWeekNoAndWeekDay(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekno=1, byweekday=MO, @@ -2084,7 +2084,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 29, 0, 0, 2)]) def testSecondlyByWeekNoAndWeekDayLarge(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekno=52, byweekday=SU, @@ -2094,7 +2094,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 28, 0, 0, 2)]) def testSecondlyByWeekNoAndWeekDayLast(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekno=-1, byweekday=SU, @@ -2104,7 +2104,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 12, 28, 0, 0, 2)]) def testSecondlyByWeekNoAndWeekDay53(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byweekno=53, byweekday=MO, @@ -2114,7 +2114,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 12, 28, 0, 0, 2)]) def testSecondlyByEaster(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byeaster=0, dtstart=parse("19970902T090000"))), @@ -2123,7 +2123,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 12, 0, 0, 2)]) def testSecondlyByEasterPos(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byeaster=1, dtstart=parse("19970902T090000"))), @@ -2132,7 +2132,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 13, 0, 0, 2)]) def testSecondlyByEasterNeg(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byeaster=-1, dtstart=parse("19970902T090000"))), @@ -2141,7 +2141,7 @@ class RRuleTest(unittest.TestCase): datetime(1998, 4, 11, 0, 0, 2)]) def testSecondlyByHour(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byhour=(6,18), dtstart=parse("19970902T090000"))), @@ -2150,7 +2150,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 0, 2)]) def testSecondlyByMinute(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byminute=(6,18), dtstart=parse("19970902T090000"))), @@ -2159,7 +2159,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 6, 2)]) def testSecondlyBySecond(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, bysecond=(6,18), dtstart=parse("19970902T090000"))), @@ -2168,7 +2168,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 1, 6)]) def testSecondlyByHourAndMinute(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byhour=(6,18), byminute=(6,18), @@ -2178,7 +2178,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 6, 2)]) def testSecondlyByHourAndSecond(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byhour=(6,18), bysecond=(6,18), @@ -2188,7 +2188,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 1, 6)]) def testSecondlyByMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byminute=(6,18), bysecond=(6,18), @@ -2198,7 +2198,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 9, 18, 6)]) def testSecondlyByHourAndMinuteAndSecond(self): - self.assertEqual(list(rrule(FREQ_SECONDLY, + self.assertEqual(list(rrule(SECONDLY, count=3, byhour=(6,18), byminute=(6,18), @@ -2209,7 +2209,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 2, 18, 18, 6)]) def testUntilNotMatching(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000"), until=parse("19970905T080000"))), @@ -2218,7 +2218,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 9, 0)]) def testUntilMatching(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000"), until=parse("19970904T090000"))), @@ -2227,21 +2227,21 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 9, 0)]) def testUntilSingle(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000"), until=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0)]) def testUntilEmpty(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000"), until=parse("19970901T090000"))), []) def testUntilWithDate(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000"), until=date(1997, 9, 5))), @@ -2250,7 +2250,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 9, 0)]) def testWkStIntervalMO(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, interval=2, byweekday=(TU,SU), @@ -2261,7 +2261,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 16, 9, 0)]) def testWkStIntervalSU(self): - self.assertEqual(list(rrule(FREQ_WEEKLY, + self.assertEqual(list(rrule(WEEKLY, count=3, interval=2, byweekday=(TU,SU), @@ -2272,7 +2272,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 16, 9, 0)]) def testDTStartIsDate(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=date(1997, 9, 2))), [datetime(1997, 9, 2, 0, 0), @@ -2280,7 +2280,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 0, 0)]) def testDTStartWithMicroseconds(self): - self.assertEqual(list(rrule(FREQ_DAILY, + self.assertEqual(list(rrule(DAILY, count=3, dtstart=parse("19970902T090000.5"))), [datetime(1997, 9, 2, 9, 0), @@ -2288,7 +2288,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 9, 0)]) def testMaxYear(self): - self.assertEqual(list(rrule(FREQ_YEARLY, + self.assertEqual(list(rrule(YEARLY, count=3, bymonth=2, bymonthday=31, @@ -2296,25 +2296,25 @@ class RRuleTest(unittest.TestCase): []) def testGetItem(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, count=3, dtstart=parse("19970902T090000"))[0], datetime(1997, 9, 2, 9, 0)) def testGetItemNeg(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, count=3, dtstart=parse("19970902T090000"))[-1], datetime(1997, 9, 4, 9, 0)) def testGetItemSlice(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=3, dtstart=parse("19970902T090000"))[1:2], [datetime(1997, 9, 3, 9, 0)]) def testGetItemSliceEmpty(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, count=3, dtstart=parse("19970902T090000"))[:], [datetime(1997, 9, 2, 9, 0), @@ -2322,56 +2322,56 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 4, 9, 0)]) def testGetItemSliceStep(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, count=3, dtstart=parse("19970902T090000"))[::-2], [datetime(1997, 9, 4, 9, 0), datetime(1997, 9, 2, 9, 0)]) def testCount(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, count=3, dtstart=parse("19970902T090000")).count(), 3) def testContains(self): - rr = rrule(FREQ_DAILY, count=3, dtstart=parse("19970902T090000")) + rr = rrule(DAILY, count=3, dtstart=parse("19970902T090000")) self.assertEqual(datetime(1997, 9, 3, 9, 0) in rr, True) def testContainsNot(self): - rr = rrule(FREQ_DAILY, count=3, dtstart=parse("19970902T090000")) + rr = rrule(DAILY, count=3, dtstart=parse("19970902T090000")) self.assertEqual(datetime(1997, 9, 3, 9, 0) not in rr, False) def testBefore(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=5, dtstart=parse("19970902T090000")) .before(parse("19970905T090000")), datetime(1997, 9, 4, 9, 0)) def testBeforeInc(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=5, dtstart=parse("19970902T090000")) .before(parse("19970905T090000"), inc=True), datetime(1997, 9, 5, 9, 0)) def testAfter(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=5, dtstart=parse("19970902T090000")) .after(parse("19970904T090000")), datetime(1997, 9, 5, 9, 0)) def testAfterInc(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=5, dtstart=parse("19970902T090000")) .after(parse("19970904T090000"), inc=True), datetime(1997, 9, 4, 9, 0)) def testBetween(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=5, dtstart=parse("19970902T090000")) .between(parse("19970902T090000"), @@ -2381,7 +2381,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 5, 9, 0)]) def testBetweenInc(self): - self.assertEqual(rrule(FREQ_DAILY, + self.assertEqual(rrule(DAILY, #count=5, dtstart=parse("19970902T090000")) .between(parse("19970902T090000"), @@ -2393,7 +2393,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 6, 9, 0)]) def testCachePre(self): - rr = rrule(FREQ_DAILY, count=15, cache=True, + rr = rrule(DAILY, count=15, cache=True, dtstart=parse("19970902T090000")) self.assertEqual(list(rr), [datetime(1997, 9, 2, 9, 0), @@ -2413,7 +2413,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 16, 9, 0)]) def testCachePost(self): - rr = rrule(FREQ_DAILY, count=15, cache=True, + rr = rrule(DAILY, count=15, cache=True, dtstart=parse("19970902T090000")) for x in rr: pass self.assertEqual(list(rr), @@ -2434,7 +2434,7 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 16, 9, 0)]) def testCachePostInternal(self): - rr = rrule(FREQ_DAILY, count=15, cache=True, + rr = rrule(DAILY, count=15, cache=True, dtstart=parse("19970902T090000")) for x in rr: pass self.assertEqual(rr._cache, @@ -2455,21 +2455,21 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 16, 9, 0)]) def testCachePreContains(self): - rr = rrule(FREQ_DAILY, count=3, cache=True, + rr = rrule(DAILY, count=3, cache=True, dtstart=parse("19970902T090000")) self.assertEqual(datetime(1997, 9, 3, 9, 0) in rr, True) def testCachePostContains(self): - rr = rrule(FREQ_DAILY, count=3, cache=True, + rr = rrule(DAILY, count=3, cache=True, dtstart=parse("19970902T090000")) for x in rr: pass self.assertEqual(datetime(1997, 9, 3, 9, 0) in rr, True) def testSet(self): set = rruleset() - set.rrule(rrule(FREQ_YEARLY, count=2, byweekday=TU, + set.rrule(rrule(YEARLY, count=2, byweekday=TU, dtstart=parse("19970902T090000"))) - set.rrule(rrule(FREQ_YEARLY, count=1, byweekday=TH, + set.rrule(rrule(YEARLY, count=1, byweekday=TH, dtstart=parse("19970902T090000"))) self.assertEqual(list(set), [datetime(1997, 9, 2, 9, 0), @@ -2478,7 +2478,7 @@ class RRuleTest(unittest.TestCase): def testSetDate(self): set = rruleset() - set.rrule(rrule(FREQ_YEARLY, count=1, byweekday=TU, + set.rrule(rrule(YEARLY, count=1, byweekday=TU, dtstart=parse("19970902T090000"))) set.rdate(datetime(1997, 9, 4, 9)) set.rdate(datetime(1997, 9, 9, 9)) @@ -2489,9 +2489,9 @@ class RRuleTest(unittest.TestCase): def testSetExRule(self): set = rruleset() - set.rrule(rrule(FREQ_YEARLY, count=6, byweekday=(TU,TH), + set.rrule(rrule(YEARLY, count=6, byweekday=(TU,TH), dtstart=parse("19970902T090000"))) - set.exrule(rrule(FREQ_YEARLY, count=3, byweekday=TH, + set.exrule(rrule(YEARLY, count=3, byweekday=TH, dtstart=parse("19970902T090000"))) self.assertEqual(list(set), [datetime(1997, 9, 2, 9, 0), @@ -2500,7 +2500,7 @@ class RRuleTest(unittest.TestCase): def testSetExDate(self): set = rruleset() - set.rrule(rrule(FREQ_YEARLY, count=6, byweekday=(TU,TH), + set.rrule(rrule(YEARLY, count=6, byweekday=(TU,TH), dtstart=parse("19970902T090000"))) set.exdate(datetime(1997, 9, 4, 9)) set.exdate(datetime(1997, 9, 11, 9)) @@ -2510,6 +2510,17 @@ class RRuleTest(unittest.TestCase): datetime(1997, 9, 9, 9, 0), datetime(1997, 9, 16, 9, 0)]) + def testSetExDateRevOrder(self): + set = rruleset() + set.rrule(rrule(MONTHLY, count=5, bymonthday=10, + dtstart=parse("20040101T090000"))) + set.exdate(datetime(2004, 4, 10, 9, 0)) + set.exdate(datetime(2004, 2, 10, 9, 0)) + self.assertEqual(list(set), + [datetime(2004, 1, 10, 9, 0), + datetime(2004, 3, 10, 9, 0), + datetime(2004, 5, 10, 9, 0)]) + def testSetDateAndExDate(self): set = rruleset() set.rdate(datetime(1997, 9, 2, 9)) @@ -2534,7 +2545,7 @@ class RRuleTest(unittest.TestCase): set.rdate(datetime(1997, 9, 11, 9)) set.rdate(datetime(1997, 9, 16, 9)) set.rdate(datetime(1997, 9, 18, 9)) - set.exrule(rrule(FREQ_YEARLY, count=3, byweekday=TH, + set.exrule(rrule(YEARLY, count=3, byweekday=TH, dtstart=parse("19970902T090000"))) self.assertEqual(list(set), [datetime(1997, 9, 2, 9, 0), @@ -2543,17 +2554,17 @@ class RRuleTest(unittest.TestCase): def testSetCount(self): set = rruleset() - set.rrule(rrule(FREQ_YEARLY, count=6, byweekday=(TU,TH), + set.rrule(rrule(YEARLY, count=6, byweekday=(TU,TH), dtstart=parse("19970902T090000"))) - set.exrule(rrule(FREQ_YEARLY, count=3, byweekday=TH, + set.exrule(rrule(YEARLY, count=3, byweekday=TH, dtstart=parse("19970902T090000"))) self.assertEqual(set.count(), 3) def testSetCachePre(self): set = rruleset() - set.rrule(rrule(FREQ_YEARLY, count=2, byweekday=TU, + set.rrule(rrule(YEARLY, count=2, byweekday=TU, dtstart=parse("19970902T090000"))) - set.rrule(rrule(FREQ_YEARLY, count=1, byweekday=TH, + set.rrule(rrule(YEARLY, count=1, byweekday=TH, dtstart=parse("19970902T090000"))) self.assertEqual(list(set), [datetime(1997, 9, 2, 9, 0), @@ -2562,9 +2573,9 @@ class RRuleTest(unittest.TestCase): def testSetCachePost(self): set = rruleset(cache=True) - set.rrule(rrule(FREQ_YEARLY, count=2, byweekday=TU, + set.rrule(rrule(YEARLY, count=2, byweekday=TU, dtstart=parse("19970902T090000"))) - set.rrule(rrule(FREQ_YEARLY, count=1, byweekday=TH, + set.rrule(rrule(YEARLY, count=1, byweekday=TH, dtstart=parse("19970902T090000"))) for x in set: pass self.assertEqual(list(set), @@ -2574,9 +2585,9 @@ class RRuleTest(unittest.TestCase): def testSetCachePostInternal(self): set = rruleset(cache=True) - set.rrule(rrule(FREQ_YEARLY, count=2, byweekday=TU, + set.rrule(rrule(YEARLY, count=2, byweekday=TU, dtstart=parse("19970902T090000"))) - set.rrule(rrule(FREQ_YEARLY, count=1, byweekday=TH, + set.rrule(rrule(YEARLY, count=1, byweekday=TH, dtstart=parse("19970902T090000"))) for x in set: pass self.assertEqual(list(set._cache), |