summaryrefslogtreecommitdiff
path: root/Lib/calendar.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1994-08-01 11:34:53 +0000
committerGuido van Rossum <guido@python.org>1994-08-01 11:34:53 +0000
commit31bcad2a833517df724fc6ca8335190170174b8f (patch)
tree4467846eced619192a031837d76b2186f28a395f /Lib/calendar.py
parentc660f7fcd25eb9d5c9ce72899c5f4a66141136d8 (diff)
downloadcpython-31bcad2a833517df724fc6ca8335190170174b8f.tar.gz
Merge alpha100 branch back to main trunk
Diffstat (limited to 'Lib/calendar.py')
-rw-r--r--Lib/calendar.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/Lib/calendar.py b/Lib/calendar.py
index 4dfcf0c8f5..e9b16447fa 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -106,12 +106,7 @@ def weekheader(width):
return str
# Print a month's calendar
-def prmonth(year, month, *rest):
- if rest[2:]: raise TypeError, 'too many args'
- w = 0
- l = 0
- if rest[0:]: w = rest[0]
- if rest[1:]: l = rest[1]
+def prmonth(year, month, w = 0, l = 0):
w = max(2, w)
l = max(1, l)
print _center(month_name[month] + ' ' + `year`, 7*(w+1) - 1),