diff options
| author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2011-03-24 14:16:39 -0300 |
|---|---|---|
| committer | Gustavo Niemeyer <gustavo@niemeyer.net> | 2011-03-24 14:16:39 -0300 |
| commit | ac37a80ce677025e03951091284feab1eadc0404 (patch) | |
| tree | 0d9d2c886439affe076804fcbefc20fd98bc56ea /test.py | |
| parent | 30af0028a6633dc415a6c41bf2f2a67bda9bb68a (diff) | |
| download | dateutil-ac37a80ce677025e03951091284feab1eadc0404.tar.gz | |
Applying Python 3 support patch by Brian Jones.
Diffstat (limited to 'test.py')
| -rw-r--r-- | test.py | 657 |
1 files changed, 329 insertions, 328 deletions
@@ -1,6 +1,6 @@ #!/usr/bin/python # -*- encoding: utf-8 -*- -from cStringIO import StringIO +from io import StringIO,BytesIO import unittest import calendar import time @@ -13,7 +13,7 @@ if os.path.exists("build"): import sys s = "build/lib.%s-%.3s" % (get_platform(), sys.version) s = os.path.join(os.getcwd(), s) - sys.path.insert(0,s) + sys.path.insert(0, s) from dateutil.relativedelta import * from dateutil.parser import * @@ -103,7 +103,7 @@ class RelativeDeltaTest(unittest.TestCase): date(2003, 4, 7)) def testMillenniumAge(self): - self.assertEqual(relativedelta(self.now, date(2001,1,1)), + self.assertEqual(relativedelta(self.now, date(2001, 1, 1)), relativedelta(years=+2, months=+8, days=+16, hours=+20, minutes=+54, seconds=+47, microseconds=+282310)) @@ -177,7 +177,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonth(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 2, 9, 0), datetime(1998, 3, 2, 9, 0), @@ -186,7 +186,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 9, 0), datetime(1997, 10, 1, 9, 0), @@ -195,8 +195,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndMonthDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 9, 0), datetime(1998, 1, 7, 9, 0), @@ -205,7 +205,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByWeekDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 4, 9, 0), @@ -214,7 +214,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByNWeekDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 25, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -223,7 +223,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByNWeekDayLarge(self): self.assertEqual(list(rrule(YEARLY, count=3, - byweekday=(TU(3),TH(-3)), + byweekday=(TU(3), TH(-3)), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 11, 9, 0), datetime(1998, 1, 20, 9, 0), @@ -232,8 +232,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndWeekDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -242,8 +242,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 6, 9, 0), datetime(1998, 1, 29, 9, 0), @@ -254,8 +254,8 @@ class RRuleTest(unittest.TestCase): # the TU(3). self.assertEqual(list(rrule(YEARLY, count=3, - bymonth=(1,3), - byweekday=(TU(3),TH(-3)), + bymonth=(1, 3), + byweekday=(TU(3), TH(-3)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 15, 9, 0), datetime(1998, 1, 20, 9, 0), @@ -264,8 +264,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 2, 3, 9, 0), @@ -274,9 +274,9 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(YEARLY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 3, 3, 9, 0), @@ -285,7 +285,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByYearDay(self): self.assertEqual(list(rrule(YEARLY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -295,7 +295,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByYearDayNeg(self): self.assertEqual(list(rrule(YEARLY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -305,8 +305,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndYearDay(self): self.assertEqual(list(rrule(YEARLY, count=4, - bymonth=(4,7), - byyearday=(1,100,200,365), + bymonth=(4, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -316,8 +316,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(YEARLY, count=4, - bymonth=(4,7), - byyearday=(-365,-266,-166,-1), + bymonth=(4, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -417,7 +417,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByHour(self): self.assertEqual(list(rrule(YEARLY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1998, 9, 2, 6, 0), @@ -426,7 +426,7 @@ class RRuleTest(unittest.TestCase): def testYearlyByMinute(self): self.assertEqual(list(rrule(YEARLY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6), datetime(1997, 9, 2, 9, 18), @@ -435,7 +435,7 @@ class RRuleTest(unittest.TestCase): def testYearlyBySecond(self): self.assertEqual(list(rrule(YEARLY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -444,8 +444,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByHourAndMinute(self): self.assertEqual(list(rrule(YEARLY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6), datetime(1997, 9, 2, 18, 18), @@ -454,8 +454,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByHourAndSecond(self): self.assertEqual(list(rrule(YEARLY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -464,8 +464,8 @@ class RRuleTest(unittest.TestCase): def testYearlyByMinuteAndSecond(self): self.assertEqual(list(rrule(YEARLY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -474,9 +474,9 @@ class RRuleTest(unittest.TestCase): def testYearlyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(YEARLY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -486,8 +486,8 @@ class RRuleTest(unittest.TestCase): self.assertEqual(list(rrule(YEARLY, count=3, bymonthday=15, - byhour=(6,18), - bysetpos=(3,-3), + byhour=(6, 18), + bysetpos=(3, -3), dtstart=parse("19970902T090000"))), [datetime(1997, 11, 15, 18, 0), datetime(1998, 2, 15, 6, 0), @@ -522,7 +522,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonth(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 2, 9, 0), datetime(1998, 3, 2, 9, 0), @@ -532,7 +532,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 9, 0), datetime(1997, 10, 1, 9, 0), @@ -541,8 +541,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndMonthDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 9, 0), datetime(1998, 1, 7, 9, 0), @@ -551,7 +551,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByWeekDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 4, 9, 0), @@ -560,7 +560,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByNWeekDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 25, 9, 0), @@ -569,7 +569,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByNWeekDayLarge(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byweekday=(TU(3),TH(-3)), + byweekday=(TU(3), TH(-3)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 11, 9, 0), datetime(1997, 9, 16, 9, 0), @@ -578,8 +578,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndWeekDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -588,8 +588,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 6, 9, 0), datetime(1998, 1, 29, 9, 0), @@ -598,8 +598,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndNWeekDayLarge(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonth=(1,3), - byweekday=(TU(3),TH(-3)), + bymonth=(1, 3), + byweekday=(TU(3), TH(-3)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 15, 9, 0), datetime(1998, 1, 20, 9, 0), @@ -608,8 +608,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 2, 3, 9, 0), @@ -618,9 +618,9 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 3, 3, 9, 0), @@ -629,7 +629,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByYearDay(self): self.assertEqual(list(rrule(MONTHLY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -639,7 +639,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByYearDayNeg(self): self.assertEqual(list(rrule(MONTHLY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -649,8 +649,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndYearDay(self): self.assertEqual(list(rrule(MONTHLY, count=4, - bymonth=(4,7), - byyearday=(1,100,200,365), + bymonth=(4, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -660,8 +660,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(MONTHLY, count=4, - bymonth=(4,7), - byyearday=(-365,-266,-166,-1), + bymonth=(4, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -752,7 +752,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByHour(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1997, 10, 2, 6, 0), @@ -761,7 +761,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMinute(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6), datetime(1997, 9, 2, 9, 18), @@ -770,7 +770,7 @@ class RRuleTest(unittest.TestCase): def testMonthlyBySecond(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -779,8 +779,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByHourAndMinute(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6), datetime(1997, 9, 2, 18, 18), @@ -789,8 +789,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByHourAndSecond(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -799,8 +799,8 @@ class RRuleTest(unittest.TestCase): def testMonthlyByMinuteAndSecond(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -809,9 +809,9 @@ class RRuleTest(unittest.TestCase): def testMonthlyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(MONTHLY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -820,9 +820,9 @@ class RRuleTest(unittest.TestCase): def testMonthlyBySetPos(self): self.assertEqual(list(rrule(MONTHLY, count=3, - bymonthday=(13,17), - byhour=(6,18), - bysetpos=(3,-3), + bymonthday=(13, 17), + byhour=(6, 18), + bysetpos=(3, -3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 13, 18, 0), datetime(1997, 9, 17, 6, 0), @@ -857,7 +857,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonth(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 6, 9, 0), datetime(1998, 1, 13, 9, 0), @@ -866,7 +866,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 9, 0), datetime(1997, 10, 1, 9, 0), @@ -875,8 +875,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthAndMonthDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 9, 0), datetime(1998, 1, 7, 9, 0), @@ -885,7 +885,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByWeekDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 4, 9, 0), @@ -894,7 +894,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByNWeekDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 4, 9, 0), @@ -906,8 +906,8 @@ class RRuleTest(unittest.TestCase): # valid recurrence. self.assertEqual(list(rrule(WEEKLY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -916,8 +916,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -926,8 +926,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 2, 3, 9, 0), @@ -936,9 +936,9 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 3, 3, 9, 0), @@ -947,7 +947,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByYearDay(self): self.assertEqual(list(rrule(WEEKLY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -957,7 +957,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByYearDayNeg(self): self.assertEqual(list(rrule(WEEKLY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -967,8 +967,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthAndYearDay(self): self.assertEqual(list(rrule(WEEKLY, count=4, - bymonth=(1,7), - byyearday=(1,100,200,365), + bymonth=(1, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -978,8 +978,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(WEEKLY, count=4, - bymonth=(1,7), - byyearday=(-365,-266,-166,-1), + bymonth=(1, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -1069,7 +1069,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByHour(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1997, 9, 9, 6, 0), @@ -1078,7 +1078,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMinute(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6), datetime(1997, 9, 2, 9, 18), @@ -1087,7 +1087,7 @@ class RRuleTest(unittest.TestCase): def testWeeklyBySecond(self): self.assertEqual(list(rrule(WEEKLY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -1096,8 +1096,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByHourAndMinute(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6), datetime(1997, 9, 2, 18, 18), @@ -1106,8 +1106,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByHourAndSecond(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -1116,8 +1116,8 @@ class RRuleTest(unittest.TestCase): def testWeeklyByMinuteAndSecond(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -1126,9 +1126,9 @@ class RRuleTest(unittest.TestCase): def testWeeklyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -1137,9 +1137,9 @@ class RRuleTest(unittest.TestCase): def testWeeklyBySetPos(self): self.assertEqual(list(rrule(WEEKLY, count=3, - byweekday=(TU,TH), - byhour=(6,18), - bysetpos=(3,-3), + byweekday=(TU, TH), + byhour=(6, 18), + bysetpos=(3, -3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1997, 9, 4, 6, 0), @@ -1174,7 +1174,7 @@ class RRuleTest(unittest.TestCase): def testDailyByMonth(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 2, 9, 0), @@ -1183,7 +1183,7 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthDay(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 9, 0), datetime(1997, 10, 1, 9, 0), @@ -1192,8 +1192,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthAndMonthDay(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 9, 0), datetime(1998, 1, 7, 9, 0), @@ -1202,7 +1202,7 @@ class RRuleTest(unittest.TestCase): def testDailyByWeekDay(self): self.assertEqual(list(rrule(DAILY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 4, 9, 0), @@ -1211,7 +1211,7 @@ class RRuleTest(unittest.TestCase): def testDailyByNWeekDay(self): self.assertEqual(list(rrule(DAILY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 4, 9, 0), @@ -1220,8 +1220,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthAndWeekDay(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -1230,8 +1230,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 1, 6, 9, 0), @@ -1240,8 +1240,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 2, 3, 9, 0), @@ -1250,9 +1250,9 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(DAILY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 3, 3, 9, 0), @@ -1261,7 +1261,7 @@ class RRuleTest(unittest.TestCase): def testDailyByYearDay(self): self.assertEqual(list(rrule(DAILY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -1271,7 +1271,7 @@ class RRuleTest(unittest.TestCase): def testDailyByYearDayNeg(self): self.assertEqual(list(rrule(DAILY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 9, 0), datetime(1998, 1, 1, 9, 0), @@ -1281,8 +1281,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthAndYearDay(self): self.assertEqual(list(rrule(DAILY, count=4, - bymonth=(1,7), - byyearday=(1,100,200,365), + bymonth=(1, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -1292,8 +1292,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(DAILY, count=4, - bymonth=(1,7), - byyearday=(-365,-266,-166,-1), + bymonth=(1, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 9, 0), datetime(1998, 7, 19, 9, 0), @@ -1383,7 +1383,7 @@ class RRuleTest(unittest.TestCase): def testDailyByHour(self): self.assertEqual(list(rrule(DAILY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1997, 9, 3, 6, 0), @@ -1392,7 +1392,7 @@ class RRuleTest(unittest.TestCase): def testDailyByMinute(self): self.assertEqual(list(rrule(DAILY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6), datetime(1997, 9, 2, 9, 18), @@ -1401,7 +1401,7 @@ class RRuleTest(unittest.TestCase): def testDailyBySecond(self): self.assertEqual(list(rrule(DAILY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -1410,8 +1410,8 @@ class RRuleTest(unittest.TestCase): def testDailyByHourAndMinute(self): self.assertEqual(list(rrule(DAILY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6), datetime(1997, 9, 2, 18, 18), @@ -1420,8 +1420,8 @@ class RRuleTest(unittest.TestCase): def testDailyByHourAndSecond(self): self.assertEqual(list(rrule(DAILY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -1430,8 +1430,8 @@ class RRuleTest(unittest.TestCase): def testDailyByMinuteAndSecond(self): self.assertEqual(list(rrule(DAILY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -1440,9 +1440,9 @@ class RRuleTest(unittest.TestCase): def testDailyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(DAILY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -1451,9 +1451,9 @@ class RRuleTest(unittest.TestCase): def testDailyBySetPos(self): self.assertEqual(list(rrule(DAILY, count=3, - byhour=(6,18), - byminute=(15,45), - bysetpos=(3,-3), + byhour=(6, 18), + byminute=(15, 45), + bysetpos=(3, -3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 15), datetime(1997, 9, 3, 6, 45), @@ -1488,7 +1488,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonth(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 1, 0), @@ -1497,7 +1497,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 0, 0), datetime(1997, 9, 3, 1, 0), @@ -1506,8 +1506,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthAndMonthDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 0, 0), datetime(1998, 1, 5, 1, 0), @@ -1516,7 +1516,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByWeekDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 2, 10, 0), @@ -1525,7 +1525,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByNWeekDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 2, 10, 0), @@ -1534,8 +1534,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthAndWeekDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 1, 0), @@ -1544,8 +1544,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 1, 0), @@ -1554,8 +1554,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 1, 0), @@ -1564,9 +1564,9 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(HOURLY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 1, 0), @@ -1575,7 +1575,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByYearDay(self): self.assertEqual(list(rrule(HOURLY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 0, 0), datetime(1997, 12, 31, 1, 0), @@ -1585,7 +1585,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByYearDayNeg(self): self.assertEqual(list(rrule(HOURLY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 0, 0), datetime(1997, 12, 31, 1, 0), @@ -1595,8 +1595,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthAndYearDay(self): self.assertEqual(list(rrule(HOURLY, count=4, - bymonth=(4,7), - byyearday=(1,100,200,365), + bymonth=(4, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 0, 0), datetime(1998, 4, 10, 1, 0), @@ -1606,8 +1606,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(HOURLY, count=4, - bymonth=(4,7), - byyearday=(-365,-266,-166,-1), + bymonth=(4, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 0, 0), datetime(1998, 4, 10, 1, 0), @@ -1693,7 +1693,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByHour(self): self.assertEqual(list(rrule(HOURLY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1997, 9, 3, 6, 0), @@ -1702,7 +1702,7 @@ class RRuleTest(unittest.TestCase): def testHourlyByMinute(self): self.assertEqual(list(rrule(HOURLY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6), datetime(1997, 9, 2, 9, 18), @@ -1711,7 +1711,7 @@ class RRuleTest(unittest.TestCase): def testHourlyBySecond(self): self.assertEqual(list(rrule(HOURLY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -1720,8 +1720,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByHourAndMinute(self): self.assertEqual(list(rrule(HOURLY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6), datetime(1997, 9, 2, 18, 18), @@ -1730,8 +1730,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByHourAndSecond(self): self.assertEqual(list(rrule(HOURLY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -1740,8 +1740,8 @@ class RRuleTest(unittest.TestCase): def testHourlyByMinuteAndSecond(self): self.assertEqual(list(rrule(HOURLY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -1750,9 +1750,9 @@ class RRuleTest(unittest.TestCase): def testHourlyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(HOURLY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -1761,9 +1761,9 @@ class RRuleTest(unittest.TestCase): def testHourlyBySetPos(self): self.assertEqual(list(rrule(HOURLY, count=3, - byminute=(15,45), - bysecond=(15,45), - bysetpos=(3,-3), + byminute=(15, 45), + bysecond=(15, 45), + bysetpos=(3, -3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 15, 45), datetime(1997, 9, 2, 9, 45, 15), @@ -1798,7 +1798,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonth(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 0, 1), @@ -1807,7 +1807,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 0, 0), datetime(1997, 9, 3, 0, 1), @@ -1816,8 +1816,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthAndMonthDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 0, 0), datetime(1998, 1, 5, 0, 1), @@ -1826,7 +1826,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByWeekDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 2, 9, 1), @@ -1835,7 +1835,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByNWeekDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), datetime(1997, 9, 2, 9, 1), @@ -1844,8 +1844,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthAndWeekDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 0, 1), @@ -1854,8 +1854,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 0, 1), @@ -1864,8 +1864,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 0, 1), @@ -1874,9 +1874,9 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0), datetime(1998, 1, 1, 0, 1), @@ -1885,7 +1885,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByYearDay(self): self.assertEqual(list(rrule(MINUTELY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 0, 0), datetime(1997, 12, 31, 0, 1), @@ -1895,7 +1895,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByYearDayNeg(self): self.assertEqual(list(rrule(MINUTELY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 0, 0), datetime(1997, 12, 31, 0, 1), @@ -1905,8 +1905,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthAndYearDay(self): self.assertEqual(list(rrule(MINUTELY, count=4, - bymonth=(4,7), - byyearday=(1,100,200,365), + bymonth=(4, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 0, 0), datetime(1998, 4, 10, 0, 1), @@ -1916,8 +1916,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(MINUTELY, count=4, - bymonth=(4,7), - byyearday=(-365,-266,-166,-1), + bymonth=(4, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 0, 0), datetime(1998, 4, 10, 0, 1), @@ -2003,7 +2003,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByHour(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0), datetime(1997, 9, 2, 18, 1), @@ -2012,7 +2012,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMinute(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6), datetime(1997, 9, 2, 9, 18), @@ -2021,7 +2021,7 @@ class RRuleTest(unittest.TestCase): def testMinutelyBySecond(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -2030,8 +2030,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByHourAndMinute(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6), datetime(1997, 9, 2, 18, 18), @@ -2040,8 +2040,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByHourAndSecond(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -2050,8 +2050,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyByMinuteAndSecond(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -2060,9 +2060,9 @@ class RRuleTest(unittest.TestCase): def testMinutelyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(MINUTELY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -2071,8 +2071,8 @@ class RRuleTest(unittest.TestCase): def testMinutelyBySetPos(self): self.assertEqual(list(rrule(MINUTELY, count=3, - bysecond=(15,30,45), - bysetpos=(3,-3), + bysecond=(15, 30, 45), + bysetpos=(3, -3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 15), datetime(1997, 9, 2, 9, 0, 45), @@ -2107,7 +2107,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonth(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonth=(1,3), + bymonth=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0, 0), datetime(1998, 1, 1, 0, 0, 1), @@ -2116,7 +2116,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonthday=(1,3), + bymonthday=(1, 3), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 3, 0, 0, 0), datetime(1997, 9, 3, 0, 0, 1), @@ -2125,8 +2125,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthAndMonthDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonth=(1,3), - bymonthday=(5,7), + bymonth=(1, 3), + bymonthday=(5, 7), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 5, 0, 0, 0), datetime(1998, 1, 5, 0, 0, 1), @@ -2135,7 +2135,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByWeekDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byweekday=(TU,TH), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 0), datetime(1997, 9, 2, 9, 0, 1), @@ -2144,7 +2144,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByNWeekDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byweekday=(TU(1),TH(-1)), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 0), datetime(1997, 9, 2, 9, 0, 1), @@ -2153,8 +2153,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthAndWeekDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonth=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0, 0), datetime(1998, 1, 1, 0, 0, 1), @@ -2163,8 +2163,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthAndNWeekDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonth=(1,3), - byweekday=(TU(1),TH(-1)), + bymonth=(1, 3), + byweekday=(TU(1), TH(-1)), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0, 0), datetime(1998, 1, 1, 0, 0, 1), @@ -2173,8 +2173,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthDayAndWeekDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonthday=(1,3), - byweekday=(TU,TH), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0, 0), datetime(1998, 1, 1, 0, 0, 1), @@ -2183,9 +2183,9 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthAndMonthDayAndWeekDay(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bymonth=(1,3), - bymonthday=(1,3), - byweekday=(TU,TH), + bymonth=(1, 3), + bymonthday=(1, 3), + byweekday=(TU, TH), dtstart=parse("19970902T090000"))), [datetime(1998, 1, 1, 0, 0, 0), datetime(1998, 1, 1, 0, 0, 1), @@ -2194,7 +2194,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByYearDay(self): self.assertEqual(list(rrule(SECONDLY, count=4, - byyearday=(1,100,200,365), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 0, 0, 0), datetime(1997, 12, 31, 0, 0, 1), @@ -2204,7 +2204,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByYearDayNeg(self): self.assertEqual(list(rrule(SECONDLY, count=4, - byyearday=(-365,-266,-166,-1), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1997, 12, 31, 0, 0, 0), datetime(1997, 12, 31, 0, 0, 1), @@ -2214,8 +2214,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthAndYearDay(self): self.assertEqual(list(rrule(SECONDLY, count=4, - bymonth=(4,7), - byyearday=(1,100,200,365), + bymonth=(4, 7), + byyearday=(1, 100, 200, 365), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 0, 0, 0), datetime(1998, 4, 10, 0, 0, 1), @@ -2225,8 +2225,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMonthAndYearDayNeg(self): self.assertEqual(list(rrule(SECONDLY, count=4, - bymonth=(4,7), - byyearday=(-365,-266,-166,-1), + bymonth=(4, 7), + byyearday=(-365, -266, -166, -1), dtstart=parse("19970902T090000"))), [datetime(1998, 4, 10, 0, 0, 0), datetime(1998, 4, 10, 0, 0, 1), @@ -2312,7 +2312,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByHour(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byhour=(6,18), + byhour=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 0), datetime(1997, 9, 2, 18, 0, 1), @@ -2321,7 +2321,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMinute(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byminute=(6,18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 0), datetime(1997, 9, 2, 9, 6, 1), @@ -2330,7 +2330,7 @@ class RRuleTest(unittest.TestCase): def testSecondlyBySecond(self): self.assertEqual(list(rrule(SECONDLY, count=3, - bysecond=(6,18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0, 6), datetime(1997, 9, 2, 9, 0, 18), @@ -2339,8 +2339,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByHourAndMinute(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byhour=(6,18), - byminute=(6,18), + byhour=(6, 18), + byminute=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 0), datetime(1997, 9, 2, 18, 6, 1), @@ -2349,8 +2349,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByHourAndSecond(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byhour=(6,18), - bysecond=(6,18), + byhour=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 0, 6), datetime(1997, 9, 2, 18, 0, 18), @@ -2359,8 +2359,8 @@ class RRuleTest(unittest.TestCase): def testSecondlyByMinuteAndSecond(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byminute=(6,18), - bysecond=(6,18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 6, 6), datetime(1997, 9, 2, 9, 6, 18), @@ -2369,9 +2369,9 @@ class RRuleTest(unittest.TestCase): def testSecondlyByHourAndMinuteAndSecond(self): self.assertEqual(list(rrule(SECONDLY, count=3, - byhour=(6,18), - byminute=(6,18), - bysecond=(6,18), + byhour=(6, 18), + byminute=(6, 18), + bysecond=(6, 18), dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 18, 6, 6), datetime(1997, 9, 2, 18, 6, 18), @@ -2433,7 +2433,7 @@ class RRuleTest(unittest.TestCase): self.assertEqual(list(rrule(WEEKLY, count=3, interval=2, - byweekday=(TU,SU), + byweekday=(TU, SU), wkst=MO, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -2444,7 +2444,7 @@ class RRuleTest(unittest.TestCase): self.assertEqual(list(rrule(WEEKLY, count=3, interval=2, - byweekday=(TU,SU), + byweekday=(TU, SU), wkst=SU, dtstart=parse("19970902T090000"))), [datetime(1997, 9, 2, 9, 0), @@ -2669,7 +2669,7 @@ class RRuleTest(unittest.TestCase): def testSetExRule(self): set = rruleset() - set.rrule(rrule(YEARLY, count=6, byweekday=(TU,TH), + set.rrule(rrule(YEARLY, count=6, byweekday=(TU, TH), dtstart=parse("19970902T090000"))) set.exrule(rrule(YEARLY, count=3, byweekday=TH, dtstart=parse("19970902T090000"))) @@ -2680,7 +2680,7 @@ class RRuleTest(unittest.TestCase): def testSetExDate(self): set = rruleset() - set.rrule(rrule(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)) @@ -2734,7 +2734,7 @@ class RRuleTest(unittest.TestCase): def testSetCount(self): set = rruleset() - set.rrule(rrule(YEARLY, count=6, byweekday=(TU,TH), + set.rrule(rrule(YEARLY, count=6, byweekday=(TU, TH), dtstart=parse("19970902T090000"))) set.exrule(rrule(YEARLY, count=3, byweekday=TH, dtstart=parse("19970902T090000"))) @@ -2961,7 +2961,7 @@ class RRuleTest(unittest.TestCase): self.assertRaises(ValueError, rrule, MONTHLY, count=1, - bysetpos=(-1,0,1), + bysetpos=(-1, 0, 1), dtstart=parse("19970902T090000")) @@ -2979,7 +2979,7 @@ class ParserTest(unittest.TestCase): tzinfo=self.brsttz)) def testDateCommandFormatUnicode(self): - self.assertEqual(parse(u"Thu Sep 25 10:36:28 BRST 2003", + self.assertEqual(parse("Thu Sep 25 10:36:28 BRST 2003", tzinfos=self.tzinfos), datetime(2003, 9, 25, 10, 36, 28, tzinfo=self.brsttz)) @@ -3570,8 +3570,8 @@ class ParserTest(unittest.TestCase): # Skip found out that sad precision problem. :-( dt1 = parse("00:11:25.01") dt2 = parse("00:12:10.01") - self.assertEquals(dt1.microsecond, 10000) - self.assertEquals(dt2.microsecond, 10000) + self.assertEqual(dt1.microsecond, 10000) + self.assertEqual(dt2.microsecond, 10000) def testMicrosecondPrecisionErrorReturns(self): # One more precision issue, discovered by Eric Brown. This should @@ -3581,10 +3581,10 @@ class ParserTest(unittest.TestCase): 1001, 1000, 999, 998, 101, 100, 99, 98]: dt = datetime(2008, 2, 27, 21, 26, 1, ms) - self.assertEquals(parse(dt.isoformat()), dt) + self.assertEqual(parse(dt.isoformat()), dt) def testHighPrecisionSeconds(self): - self.assertEquals(parse("20080227T21:26:01.123456789"), + self.assertEqual(parse("20080227T21:26:01.123456789"), datetime(2008, 2, 27, 21, 26, 1, 123456)) def testCustomParserInfo(self): @@ -3595,7 +3595,7 @@ class ParserTest(unittest.TestCase): MONTHS[0] = ("Foo", "Foo") myparser = parser(myparserinfo()) dt = myparser.parse("01/Foo/2007") - self.assertEquals(dt, datetime(2007, 1, 1)) + self.assertEqual(dt, datetime(2007, 1, 1)) class EasterTest(unittest.TestCase): @@ -3677,7 +3677,7 @@ class EasterTest(unittest.TestCase): class TZTest(unittest.TestCase): - TZFILE_EST5EDT = """ + TZFILE_EST5EDT = b""" VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAADrAAAABAAAABCeph5wn7rrYKCGAHCh ms1gomXicKOD6eCkaq5wpTWnYKZTyvCnFYlgqDOs8Kj+peCqE47wqt6H4KvzcPCsvmngrdNS8K6e S+CvszTwsH4t4LGcUXCyZ0pgs3wzcLRHLGC1XBVwticOYLc793C4BvBguRvZcLnm0mC7BPXwu8a0 @@ -3703,7 +3703,7 @@ AAEAAQABAAEAAQABAAEAAQABAAEAAf//x8ABAP//ubAABP//x8ABCP//x8ABDEVEVABFU1QARVdU AEVQVAAAAAABAAAAAQ== """ - EUROPE_HELSINKI = """ + EUROPE_HELSINKI = b""" VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABQAAAAAAAAB1AAAABQAAAA2kc28Yy85RYMy/hdAV I+uQFhPckBcDzZAX876QGOOvkBnToJAaw5GQG7y9EBysrhAdnJ8QHoyQEB98gRAgbHIQIVxjECJM VBAjPEUQJCw2ECUcJxAmDBgQJwVDkCf1NJAo5SWQKdUWkCrFB5ArtPiQLKTpkC2U2pAuhMuQL3S8 @@ -3718,7 +3718,7 @@ BAMEAwQDBAMEAwQDBAMEAwQDBAMEAwQDBAMEAwQDBAMEAwQDBAMEAwQDBAMEAwQDBAMEAwQDBAME AwQAABdoAAAAACowAQQAABwgAAkAACowAQQAABwgAAlITVQARUVTVABFRVQAAAAAAQEAAAABAQ== """ - NEW_YORK = """ + NEW_YORK = b""" VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAABcAAADrAAAABAAAABCeph5wn7rrYKCGAHCh ms1gomXicKOD6eCkaq5wpTWnYKZTyvCnFYlgqDOs8Kj+peCqE47wqt6H4KvzcPCsvmngrdNS8K6e S+CvszTwsH4t4LGcUXCyZ0pgs3wzcLRHLGC1XBVwticOYLc793C4BvBguRvZcLnm0mC7BPXwu8a0 @@ -3770,85 +3770,85 @@ END:VTIMEZONE """ def testStrStart1(self): - self.assertEqual(datetime(2003,4,6,1,59, + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tzstr("EST5EDT")).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00, + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tzstr("EST5EDT")).tzname(), "EDT") def testStrEnd1(self): - self.assertEqual(datetime(2003,10,26,0,59, + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tzstr("EST5EDT")).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00, + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tzstr("EST5EDT")).tzname(), "EST") def testStrStart2(self): s = "EST5EDT,4,0,6,7200,10,0,26,7200,3600" - self.assertEqual(datetime(2003,4,6,1,59, + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tzstr(s)).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00, + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tzstr(s)).tzname(), "EDT") def testStrEnd2(self): s = "EST5EDT,4,0,6,7200,10,0,26,7200,3600" - self.assertEqual(datetime(2003,10,26,0,59, + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tzstr(s)).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00, + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tzstr(s)).tzname(), "EST") def testStrStart3(self): s = "EST5EDT,4,1,0,7200,10,-1,0,7200,3600" - self.assertEqual(datetime(2003,4,6,1,59, + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tzstr(s)).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00, + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tzstr(s)).tzname(), "EDT") def testStrEnd3(self): s = "EST5EDT,4,1,0,7200,10,-1,0,7200,3600" - self.assertEqual(datetime(2003,10,26,0,59, + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tzstr(s)).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00, + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tzstr(s)).tzname(), "EST") def testStrStart4(self): s = "EST5EDT4,M4.1.0/02:00:00,M10-5-0/02:00" - self.assertEqual(datetime(2003,4,6,1,59, + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tzstr(s)).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00, + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tzstr(s)).tzname(), "EDT") def testStrEnd4(self): s = "EST5EDT4,M4.1.0/02:00:00,M10-5-0/02:00" - self.assertEqual(datetime(2003,10,26,0,59, + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tzstr(s)).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00, + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tzstr(s)).tzname(), "EST") def testStrStart5(self): s = "EST5EDT4,95/02:00:00,298/02:00" - self.assertEqual(datetime(2003,4,6,1,59, + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tzstr(s)).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00, + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tzstr(s)).tzname(), "EDT") def testStrEnd5(self): s = "EST5EDT4,95/02:00:00,298/02" - self.assertEqual(datetime(2003,10,26,0,59, + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tzstr(s)).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00, + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tzstr(s)).tzname(), "EST") def testStrStart6(self): s = "EST5EDT4,J96/02:00:00,J299/02:00" - self.assertEqual(datetime(2003,4,6,1,59, + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tzstr(s)).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00, + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tzstr(s)).tzname(), "EDT") def testStrEnd6(self): s = "EST5EDT4,J96/02:00:00,J299/02" - self.assertEqual(datetime(2003,10,26,0,59, + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tzstr(s)).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00, + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tzstr(s)).tzname(), "EST") def testStrCmp1(self): @@ -3874,77 +3874,78 @@ END:VTIMEZONE tzrange("EST", -18000, "EDT")) def testFileStart1(self): - tz = tzfile(StringIO(base64.decodestring(self.TZFILE_EST5EDT))) - self.assertEqual(datetime(2003,4,6,1,59,tzinfo=tz).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00,tzinfo=tz).tzname(), "EDT") + tz = tzfile(BytesIO(base64.decodebytes(self.TZFILE_EST5EDT))) + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tz).tzname(), "EST") + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tz).tzname(), "EDT") def testFileEnd1(self): - tz = tzfile(StringIO(base64.decodestring(self.TZFILE_EST5EDT))) - self.assertEqual(datetime(2003,10,26,0,59,tzinfo=tz).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00,tzinfo=tz).tzname(), "EST") + tz = tzfile(BytesIO(base64.decodebytes(self.TZFILE_EST5EDT))) + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tz).tzname(), "EDT") + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tz).tzname(), "EST") def testZoneInfoFileStart1(self): tz = zoneinfo.gettz("EST5EDT") - self.assertEqual(datetime(2003,4,6,1,59,tzinfo=tz).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00,tzinfo=tz).tzname(), "EDT") + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tz).tzname(), "EST") + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tz).tzname(), "EDT") def testZoneInfoFileEnd1(self): tz = zoneinfo.gettz("EST5EDT") - self.assertEqual(datetime(2003,10,26,0,59,tzinfo=tz).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00,tzinfo=tz).tzname(), "EST") + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tz).tzname(), "EDT") + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tz).tzname(), "EST") def testZoneInfoOffsetSignal(self): - utc = gettz("UTC") + utc = zoneinfo.gettz("UTC") nyc = zoneinfo.gettz("America/New_York") - t0 = datetime(2007,11,4,0,30, tzinfo=nyc) + self.assertFalse(any([None in [utc, nyc]])) + t0 = datetime(2007, 11, 4, 0, 30, tzinfo=nyc) t1 = t0.astimezone(utc) t2 = t1.astimezone(nyc) - self.assertEquals(t0, t2) - self.assertEquals(nyc.dst(t0), timedelta(hours=1)) + self.assertEqual(t0, t2) + self.assertEqual(nyc.dst(t0), timedelta(hours=1)) def testICalStart1(self): tz = tzical(StringIO(self.TZICAL_EST5EDT)).get() - self.assertEqual(datetime(2003,4,6,1,59,tzinfo=tz).tzname(), "EST") - self.assertEqual(datetime(2003,4,6,2,00,tzinfo=tz).tzname(), "EDT") + self.assertEqual(datetime(2003, 4, 6, 1, 59, tzinfo=tz).tzname(), "EST") + self.assertEqual(datetime(2003, 4, 6, 2, 00, tzinfo=tz).tzname(), "EDT") def testICalEnd1(self): tz = tzical(StringIO(self.TZICAL_EST5EDT)).get() - self.assertEqual(datetime(2003,10,26,0,59,tzinfo=tz).tzname(), "EDT") - self.assertEqual(datetime(2003,10,26,1,00,tzinfo=tz).tzname(), "EST") + self.assertEqual(datetime(2003, 10, 26, 0, 59, tzinfo=tz).tzname(), "EDT") + self.assertEqual(datetime(2003, 10, 26, 1, 00, tzinfo=tz).tzname(), "EST") def testRoundNonFullMinutes(self): # This timezone has an offset of 5992 seconds in 1900-01-01. - tz = tzfile(StringIO(base64.decodestring(self.EUROPE_HELSINKI))) - self.assertEquals(str(datetime(1900,1,1,0,0, tzinfo=tz)), - "1900-01-01 00:00:00+01:40") + tz = tzfile(BytesIO(base64.decodebytes(self.EUROPE_HELSINKI))) + self.assertEqual(str(datetime(1900, 1, 1, 0, 0, tzinfo=tz)), + "1900-01-01 00:00:00+01:40") def testLeapCountDecodesProperly(self): # This timezone has leapcnt, and failed to decode until # Eugene Oden notified about the issue. - tz = tzfile(StringIO(base64.decodestring(self.NEW_YORK))) - self.assertEquals(datetime(2007,3,31,20,12).tzname(), None) + tz = tzfile(BytesIO(base64.decodebytes(self.NEW_YORK))) + self.assertEqual(datetime(2007, 3, 31, 20, 12).tzname(), None) def testBrokenIsDstHandling(self): # tzrange._isdst() was using a date() rather than a datetime(). # Issue reported by Lennart Regebro. - dt = datetime(2007,8,6,4,10, tzinfo=tzutc()) - self.assertEquals(dt.astimezone(tz=gettz("GMT+2")), - datetime(2007,8,6,6,10, tzinfo=tzstr("GMT+2"))) + dt = datetime(2007, 8, 6, 4, 10, tzinfo=tzutc()) + self.assertEqual(dt.astimezone(tz=gettz("GMT+2")), + datetime(2007, 8, 6, 6, 10, tzinfo=tzstr("GMT+2"))) def testGMTHasNoDaylight(self): # tzstr("GMT+2") improperly considered daylight saving time. # Issue reported by Lennart Regebro. - dt = datetime(2007,8,6,4,10) - self.assertEquals(gettz("GMT+2").dst(dt), timedelta(0)) + dt = datetime(2007, 8, 6, 4, 10) + self.assertEqual(gettz("GMT+2").dst(dt), timedelta(0)) def testGMTOffset(self): # GMT and UTC offsets have inverted signal when compared to the # usual TZ variable handling. - dt = datetime(2007,8,6,4,10, tzinfo=tzutc()) - self.assertEquals(dt.astimezone(tz=tzstr("GMT+2")), - datetime(2007,8,6,6,10, tzinfo=tzstr("GMT+2"))) - self.assertEquals(dt.astimezone(tz=gettz("UTC-2")), - datetime(2007,8,6,2,10, tzinfo=tzstr("UTC-2"))) + dt = datetime(2007, 8, 6, 4, 10, tzinfo=tzutc()) + self.assertEqual(dt.astimezone(tz=tzstr("GMT+2")), + datetime(2007, 8, 6, 6, 10, tzinfo=tzstr("GMT+2"))) + self.assertEqual(dt.astimezone(tz=gettz("UTC-2")), + datetime(2007, 8, 6, 2, 10, tzinfo=tzstr("UTC-2"))) if __name__ == "__main__": |