Kaydet (Commit) 0595ed21 authored tarafından Serhiy Storchaka's avatar Serhiy Storchaka

Issue #28255: calendar.TextCalendar.prweek() no longer prints a space after

a weeks's calendar.  calendar.TextCalendar.pryear() no longer prints redundant
newline after a year's calendar.  Based on patch by Xiang Zhang.
üst 78d84d83
...@@ -267,7 +267,7 @@ class TextCalendar(Calendar): ...@@ -267,7 +267,7 @@ class TextCalendar(Calendar):
""" """
Print a single week (no newline). Print a single week (no newline).
""" """
print(self.formatweek(theweek, width), end=' ') print(self.formatweek(theweek, width), end='')
def formatday(self, day, weekday, width): def formatday(self, day, weekday, width):
""" """
...@@ -371,7 +371,7 @@ class TextCalendar(Calendar): ...@@ -371,7 +371,7 @@ class TextCalendar(Calendar):
def pryear(self, theyear, w=0, l=0, c=6, m=3): def pryear(self, theyear, w=0, l=0, c=6, m=3):
"""Print a year's calendar.""" """Print a year's calendar."""
print(self.formatyear(theyear, w, l, c, m)) print(self.formatyear(theyear, w, l, c, m), end='')
class HTMLCalendar(Calendar): class HTMLCalendar(Calendar):
......
...@@ -404,7 +404,7 @@ class OutputTestCase(unittest.TestCase): ...@@ -404,7 +404,7 @@ class OutputTestCase(unittest.TestCase):
with support.captured_stdout() as out: with support.captured_stdout() as out:
week = [(1,0), (2,1), (3,2), (4,3), (5,4), (6,5), (7,6)] week = [(1,0), (2,1), (3,2), (4,3), (5,4), (6,5), (7,6)]
calendar.TextCalendar().prweek(week, 1) calendar.TextCalendar().prweek(week, 1)
self.assertEqual(out.getvalue().strip(), "1 2 3 4 5 6 7") self.assertEqual(out.getvalue(), " 1 2 3 4 5 6 7")
def test_prmonth(self): def test_prmonth(self):
with support.captured_stdout() as out: with support.captured_stdout() as out:
...@@ -414,7 +414,7 @@ class OutputTestCase(unittest.TestCase): ...@@ -414,7 +414,7 @@ class OutputTestCase(unittest.TestCase):
def test_pryear(self): def test_pryear(self):
with support.captured_stdout() as out: with support.captured_stdout() as out:
calendar.TextCalendar().pryear(2004) calendar.TextCalendar().pryear(2004)
self.assertEqual(out.getvalue().strip(), result_2004_text.strip()) self.assertEqual(out.getvalue(), result_2004_text)
def test_format(self): def test_format(self):
with support.captured_stdout() as out: with support.captured_stdout() as out:
......
...@@ -97,7 +97,11 @@ Core and Builtins ...@@ -97,7 +97,11 @@ Core and Builtins
Library Library
------- -------
- Issue #28255: calendar.TextCalendar().prmonth() no longer prints a space - Issue #28255: calendar.TextCalendar.prweek() no longer prints a space after
a weeks's calendar. calendar.TextCalendar.pryear() no longer prints redundant
newline after a year's calendar. Based on patch by Xiang Zhang.
- Issue #28255: calendar.TextCalendar.prmonth() no longer prints a space
at the start of new line after printing a month's calendar. Patch by at the start of new line after printing a month's calendar. Patch by
Xiang Zhang. Xiang Zhang.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment