- Removed FREQ_ prefix from frequency constants.
diff --git a/test.py b/test.py
index 4e81758..b40925c 100644
--- a/test.py
+++ b/test.py
@@ -142,7 +142,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
[])
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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),