Add tests and simplify normalize

Author: StanFromIreland

Lib/test/test_tools/test_i18n.py

@@ -4,6 +4,7 @@
 import re
 import sys
 import unittest
+from test.test_decimal import skip_expected
 from textwrap import dedent
 from pathlib import Path
 
@@ -18,7 +19,7 @@
 
 
 with imports_under_tool("i18n"):
-    from pygettext import parse_spec
+    from pygettext import parse_spec, normalize, make_escapes
 
 
 def normalize_POT_file(pot):
@@ -516,6 +517,42 @@ def test_parse_keyword_spec(self):
                     parse_spec(spec)
                 self.assertEqual(str(cm.exception), message)
 
+    def test_normalize_multiline(self):
+        # required to set up normalize
+        class NormOptions:
+            width = 78
+        make_escapes(True)
+
+        s = 'multi-line\n translation'
+        s_expected = '""\n"multi-line\\n"\n" translation"'
+
+        data = normalize(s, 'UTF-8', NormOptions)
+        self.assertEqual(s_expected, data)
+
+    def test_normalize_wrap(self):
+        # required to set up normalize
+        class NormOptions:
+            width = 30
+        make_escapes(True)
+
+        s = 'this string should be wrapped to 30 chars'
+        s_expected = '""\n"this string should be wrapped "\n"to 30 chars"'
+
+        data = normalize(s, 'UTF-8', NormOptions)
+        self.assertEqual(s_expected, data)
+
+    def test_normalize_nostr(self):
+        # required to set up normalize
+        class NormOptions:
+            width = 78
+        make_escapes(True)
+
+        s = ''
+        s_expected = '""'
+
+        data = normalize(s, 'UTF-8', NormOptions)
+        self.assertEqual(s_expected, data)
+
 
 def extract_from_snapshots():
     snapshots = {

Tools/i18n/pygettext.py

@@ -225,7 +225,7 @@ def normalize(s, encoding, options):
             words = space_splitter(line)
             words.reverse()
             buf = []
-            size = 2
+            size = 0
             while words:
                 word = words.pop()
                 escaped_word_len = len(escape(word, encoding))
@@ -235,17 +235,13 @@ def normalize(s, encoding, options):
                 else:
                     lines.append(''.join(buf))
                     buf = [word]
-                    size = 2 + escaped_word_len
+                    size = escaped_word_len
             lines.append(''.join(buf))
         else:
             lines.append(line)
     if len(lines) <= 1:
         return f'"{escape(s, encoding)}"'
-    if lines and not lines[-1]:
-        del lines[-1]
-        lines[-1] += '\n'
-    return '""\n' + '\n'.join(
-        [f'"{escape(line, encoding)}"' for line in lines])
+    return '""\n' + '\n'.join([f'"{escape(line, encoding)}"' for line in lines])
 
 
 def containsAny(str, set):