Preserve spaces and remove unnecessary checks

Author: StanFromIreland

Lib/test/test_tools/i18n_data/messages.pot

@@ -35,7 +35,7 @@ msgstr ""
 
 #: messages.py:32
 msgid ""
-"this is a very very very very very very very very very very very very very"
+"this is a very very very very very very very very very very very very very "
 "long string!"
 msgstr ""
 

Lib/test/translationdata/argparse/msgids.txt

@@ -16,7 +16,7 @@ expected one argument
 ignored explicit argument %r
 invalid %(type)s value: %(value)r
 invalid choice: %(value)r (choose from %(choices)s)
-invalid choice: %(value)r, maybe you meant %(closest)r? (choose from%(choices)s)
+invalid choice: %(value)r, maybe you meant %(closest)r? (choose from %(choices)s)
 not allowed with argument %s
 one of the arguments %s is required
 option '%(option)s' is deprecated

Tools/i18n/pygettext.py

@@ -148,6 +148,7 @@
 import sys
 import time
 import tokenize
+import re
 from dataclasses import dataclass, field
 from io import BytesIO
 from operator import itemgetter
@@ -220,25 +221,21 @@ def normalize(s, encoding, options):
     lines = []
     for line in s.splitlines(True):
         if len(escape(line, encoding)) > options.width:
-            words = line.split()
+            words = re.split(r'(\s+)', line)
             words.reverse()
+            buf = []
+            size = 2
             while words:
-                buf = []
-                size = 2
-                while words:
-                    word = words[-1]
-                    escaped_word = escape(word, encoding)
-                    escaped_word_len = len(escaped_word)
-                    add_space = 1 if buf else 0
-                    new_size = size + escaped_word_len + add_space
-                    if new_size <= options.width:
-                        buf.append(words.pop())
-                        size = new_size
-                    else:
-                        if not buf:
-                            buf = [words.pop()]
-                        break
-                lines.append(' '.join(buf))
+                word = words.pop()
+                escaped_word_len = len(escape(word, encoding))
+                if size + escaped_word_len <= options.width:
+                    buf.append(word)
+                    size += escaped_word_len
+                else:
+                    lines.append(''.join(buf))
+                    buf = [word]
+                    size = 2 + escaped_word_len
+            lines.append(''.join(buf))
         else:
             lines.append(line)
     if len(lines) <= 1: