summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-10-25 12:00:52 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-10-25 12:00:52 (GMT)
commit7ff51bd2b8b8407942e3bab2c9267cc8b95f06be (patch)
tree309cc779cf34977bf0aec44b944146186ee29598
parentf3ebc9fe3fae3d44da4d0da9764ed7c033115f12 (diff)
downloadcpython-7ff51bd2b8b8407942e3bab2c9267cc8b95f06be.zip
cpython-7ff51bd2b8b8407942e3bab2c9267cc8b95f06be.tar.gz
cpython-7ff51bd2b8b8407942e3bab2c9267cc8b95f06be.tar.bz2
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.
-rw-r--r--Lib/calendar.py2
-rw-r--r--Lib/test/test_calendar.py3
-rw-r--r--Misc/NEWS4
3 files changed, 6 insertions, 3 deletions
diff --git a/Lib/calendar.py b/Lib/calendar.py
index b5472f3..76cf8de 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -312,7 +312,7 @@ class TextCalendar(Calendar):
"""
Print a month's calendar.
"""
- print(self.formatmonth(theyear, themonth, w, l), end=' ')
+ print(self.formatmonth(theyear, themonth, w, l), end='')
def formatmonth(self, theyear, themonth, w=0, l=0):
"""
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index 5de3ce8..accf251 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -409,8 +409,7 @@ class OutputTestCase(unittest.TestCase):
def test_prmonth(self):
with support.captured_stdout() as out:
calendar.TextCalendar().prmonth(2004, 1)
- output = out.getvalue().strip()
- self.assertEqual(output, result_2004_01_text.strip())
+ self.assertEqual(out.getvalue(), result_2004_01_text)
def test_pryear(self):
with support.captured_stdout() as out:
diff --git a/Misc/NEWS b/Misc/NEWS
index c440571..a20870f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,10 @@ Core and Builtins
Library
-------
+- 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.
+
- Issue #20491: The textwrap.TextWrapper class now honors non-breaking spaces.
Based on patch by Kaarle Ritvanen.