Apply suggestions from Serhiy

Author: StanFromIreland

Lib/test/test_tools/test_i18n.py

@@ -540,13 +540,13 @@ def test_normalize_wrap(self):
                 data = normalize(raw, 'UTF-8', 'msgid', 30)
                 self.assertEqual(expected, data)
 
-    def test_normalize_nostr(self):
+    def test_normalize_empty_str(self):
         data = normalize('', 'UTF-8', 'msgid', 30)
         self.assertEqual('""', data)
 
     def test_normalize_single_word(self):
         for s in ("fee", "fi", "fo", "fums"):
-            data = normalize(s, 'UTF-8', 'msgid', 3)
+            data = normalize(s, 'UTF-8', 'msgid', 8)
             self.assertNotIn('""', data) # did not wrap
 
     def test_normalize_split_on_whitespace(self):
@@ -557,6 +557,11 @@ def test_normalize_split_on_whitespace(self):
             data = normalize(s, 'UTF-8', 'msgid', 10)
             self.assertEqual(s_expected, data)
 
+        s = f'longlonglong\r\nword'
+        s_expected = f'""\n"longlonglong\\r\\n"\n"word"'
+        data = normalize(s, 'UTF-8', 'msgid', 30)
+        self.assertEqual(s_expected, data)
+
 
 def extract_from_snapshots():
     snapshots = {

Tools/i18n/pygettext.py

@@ -230,13 +230,13 @@ def normalize(s, encoding, prefix, width):
             words = _space_splitter.findall(line)
             words.reverse()
             buf = []
-            size = 2
+            size = 0
             while words:
                 word = words.pop()
                 escaped_word = escape(word, encoding)
                 escaped_word_len = len(escaped_word)
                 new_size = size + escaped_word_len
-                if new_size <= width or not buf:
+                if new_size + 2 <= width or not buf:
                     buf.append(escaped_word)
                     size = new_size
                 else: