From: Walter Dörwald <walter@livinglogic.de>
Date: Mon, 3 Apr 2006 15:24:49 +0000 (+0000)
Subject: For backwards compatibility reasons the global function
X-Git-Tag: v2.5a1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a1b4a69b76f866400611287cba9016a519322e3;p=python

For backwards compatibility reasons the global function
setfirstweekday() still needs to do a range check.
---

diff --git a/Lib/calendar.py b/Lib/calendar.py
index 4965773c73..723bb3c8d4 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -132,9 +132,10 @@ class Calendar(object):
 
     def getfirstweekday(self):
         return self._firstweekday % 7
-    
+
     def setfirstweekday(self, firstweekday):
         self._firstweekday = firstweekday
+
     firstweekday = property(getfirstweekday, setfirstweekday)
 
     def iterweekdays(self):
@@ -159,7 +160,7 @@ class Calendar(object):
         while True:
             yield date
             date += oneday
-            if date.month != month and date.weekday() == self.firstweekday%7:
+            if date.month != month and date.weekday() == self.firstweekday:
                 break
 
     def itermonthdays2(self, year, month):
@@ -567,7 +568,12 @@ class LocaleHTMLCalendar(HTMLCalendar):
 c = TextCalendar()
 
 firstweekday = c.getfirstweekday
-setfirstweekday = c.setfirstweekday
+
+def setfirstweekday(firstweekday):
+    if not MONDAY <= firstweekday <= SUNDAY:
+        raise IllegalWeekdayError(firstweekday)
+    c.firstweekday = firstweekday
+
 monthcalendar = c.monthdayscalendar
 prweek = c.prweek
 week = c.formatweek