From 0595ed21badc29b5c76602e32db9f5f1b8f0ba06 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 25 Oct 2016 15:20:58 +0300 Subject: 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. --- Lib/calendar.py | 4 ++-- Lib/test/test_calendar.py | 4 ++-- Misc/NEWS | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Lib/calendar.py b/Lib/calendar.py index 07594f3..28ac56f 100644 --- a/Lib/calendar.py +++ b/Lib/calendar.py @@ -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): diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index 2bc4fee..bd57653 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -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: diff --git a/Misc/NEWS b/Misc/NEWS index c335fe0..f6cf545 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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. -- cgit v0.12