From: Serhiy Storchaka Date: Fri, 10 Oct 2025 13:29:18 +0000 (+0300) Subject: gh-139065: Fix trailing space before long word in textwrap (GH-139070) X-Git-Tag: v3.15.0a1~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c598e04361dbfc9cf465f3a02f83715c11b028c;p=thirdparty%2FPython%2Fcpython.git gh-139065: Fix trailing space before long word in textwrap (GH-139070) Fix trailing space before a wrapped long word if the line length with a space is exactly "width". --- diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py index cbd383ea4e26..aca1f427656b 100644 --- a/Lib/test/test_textwrap.py +++ b/Lib/test/test_textwrap.py @@ -605,7 +605,7 @@ How *do* you spell that odd word, anyways? # bug 1146. Prevent a long word to be wrongly wrapped when the # preceding word is exactly one character shorter than the width self.check_wrap(self.text, 12, - ['Did you say ', + ['Did you say', '"supercalifr', 'agilisticexp', 'ialidocious?', @@ -633,7 +633,7 @@ How *do* you spell that odd word, anyways? def test_max_lines_long(self): self.check_wrap(self.text, 12, - ['Did you say ', + ['Did you say', '"supercalifr', 'agilisticexp', '[...]'], diff --git a/Lib/textwrap.py b/Lib/textwrap.py index 5ae439f5cd3b..41366fbf443a 100644 --- a/Lib/textwrap.py +++ b/Lib/textwrap.py @@ -211,7 +211,7 @@ class TextWrapper: # If we're allowed to break long words, then do so: put as much # of the next chunk onto the current line as will fit. - if self.break_long_words: + if self.break_long_words and space_left > 0: end = space_left chunk = reversed_chunks[-1] if self.break_on_hyphens and len(chunk) > space_left: diff --git a/Misc/NEWS.d/next/Library/2025-09-17-19-08-34.gh-issue-139065.Hu8fM5.rst b/Misc/NEWS.d/next/Library/2025-09-17-19-08-34.gh-issue-139065.Hu8fM5.rst new file mode 100644 index 000000000000..20c006039592 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-09-17-19-08-34.gh-issue-139065.Hu8fM5.rst @@ -0,0 +1,2 @@ +Fix trailing space before a wrapped long word if the line length is exactly +*width* in :mod:`textwrap`.