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.
This commit is contained in:
Serhiy Storchaka 2016-10-25 15:20:58 +03:00
parent 78d84d8326
commit 0595ed21ba
3 changed files with 9 additions and 5 deletions

View File

@ -267,7 +267,7 @@ class TextCalendar(Calendar):
"""
Print a single week (no newline).
"""
print(self.formatweek(theweek, width), end=' ')
print(self.formatweek(theweek, width), end='')
def formatday(self, day, weekday, width):
"""
@ -371,7 +371,7 @@ class TextCalendar(Calendar):
def pryear(self, theyear, w=0, l=0, c=6, m=3):
"""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):

View File

@ -404,7 +404,7 @@ class OutputTestCase(unittest.TestCase):
with support.captured_stdout() as out:
week = [(1,0), (2,1), (3,2), (4,3), (5,4), (6,5), (7,6)]
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):
with support.captured_stdout() as out:
@ -414,7 +414,7 @@ class OutputTestCase(unittest.TestCase):
def test_pryear(self):
with support.captured_stdout() as out:
calendar.TextCalendar().pryear(2004)
self.assertEqual(out.getvalue().strip(), result_2004_text.strip())
self.assertEqual(out.getvalue(), result_2004_text)
def test_format(self):
with support.captured_stdout() as out:

View File

@ -97,7 +97,11 @@ Core and Builtins
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
Xiang Zhang.