commit b47d12aa42f3d978ce6ec03fb958230843d5d61d
author niemeyer Mon Sep 29 20:00:21 2003 +0000
committer niemeyer Mon Sep 29 20:00:21 2003 +0000
tree afe785bf5e649e741e5ba186aa2466663742019b
parent 68ae2757ae15c84bf947d47a82a314b3b975bc9b

Implemented new scheme to pass weekday information to relativedelta.

test.py

diff --git a/test.py b/test.py
index a3db6df..4f1e66c 100644
--- a/test.py
+++ b/test.py
@@ -74,30 +74,29 @@
                          date(2000, 3, 1))
 
     def testNextFriday(self):
-        self.assertEqual(self.today +
-                         relativedelta(weekday=(calendar.FRIDAY, +1)),
+        self.assertEqual(self.today+relativedelta(weekday=FR),
+                         date(2003, 9, 19))
+
+    def testNextFridayInt(self):
+        self.assertEqual(self.today+relativedelta(weekday=calendar.FRIDAY),
                          date(2003, 9, 19))
 
     def testLastFridayInThisMonth(self):
-        self.assertEqual(self.today +
-                         relativedelta(day=31, weekday=(calendar.FRIDAY, -1)),
+        self.assertEqual(self.today+relativedelta(day=31, weekday=FR(-1)),
                          date(2003, 9, 26))
 
     def testNextWednesdayIsToday(self):
-        self.assertEqual(self.today +
-                         relativedelta(weekday=(calendar.WEDNESDAY, +1)),
+        self.assertEqual(self.today+relativedelta(weekday=WE),
                          date(2003, 9, 17))
 
 
     def testNextWenesdayNotToday(self):
-        self.assertEqual(self.today +
-                         relativedelta(days=+1,
-                                       weekday=(calendar.WEDNESDAY, +1)),
+        self.assertEqual(self.today+relativedelta(days=+1, weekday=WE),
                          date(2003, 9, 24))
         
     def test15thISOYearWeek(self):
         self.assertEqual(date(2003, 1, 1) +
-                         relativedelta(day=4, weekday=(0, -1), weeks=+14),
+                         relativedelta(day=4, weeks=+14, weekday=MO(-1)),
                          date(2003, 4, 7))
 
     def testMillenniumAge(self):
@@ -898,10 +897,10 @@
                          tzrange("EST", -18000, "EDT", -14400,
                                  relativedelta(hours=+2,
                                                month=4, day=1,
-                                               weekday=(6, 1)),
+                                               weekday=SU(+1)),
                                  relativedelta(hours=+1,
                                                month=10, day=31,
-                                               weekday=(6, -1))))
+                                               weekday=SU(-1))))
 
     def testRangeCmp2(self):
         self.assertEqual(tzstr("EST5EDT"),