Benedikt's suggestions

Author: StanFromIreland

Lib/test/test_tools/test_i18n.py

@@ -4,7 +4,7 @@
 import re
 import sys
 import unittest
-from test.test_decimal import skip_expected
+from types import SimpleNamespace
 from textwrap import dedent
 from pathlib import Path
 
@@ -519,38 +519,35 @@ def test_parse_keyword_spec(self):
 
     def test_normalize_multiline(self):
         # required to set up normalize
-        class NormOptions:
-            width = 78
+        options = SimpleNamespace(width=78)
         make_escapes(True)
 
         s = 'multi-line\n translation'
         s_expected = '""\n"multi-line\\n"\n" translation"'
 
-        data = normalize(s, 'UTF-8', NormOptions)
+        data = normalize(s, 'UTF-8', options)
         self.assertEqual(s_expected, data)
 
     def test_normalize_wrap(self):
         # required to set up normalize
-        class NormOptions:
-            width = 30
+        options = SimpleNamespace(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)
+        data = normalize(s, 'UTF-8', options)
         self.assertEqual(s_expected, data)
 
     def test_normalize_nostr(self):
         # required to set up normalize
-        class NormOptions:
-            width = 78
+        options = SimpleNamespace(width=30)
         make_escapes(True)
 
         s = ''
         s_expected = '""'
 
-        data = normalize(s, 'UTF-8', NormOptions)
+        data = normalize(s, 'UTF-8', options)
         self.assertEqual(s_expected, data)
 
 

Tools/i18n/pygettext.py

@@ -213,13 +213,13 @@ def escape_ascii(s, encoding):
 def escape_nonascii(s, encoding):
     return ''.join(escapes[b] for b in s.encode(encoding))
 
+space_splitter = re.compile(r'(\s+)').split
 
 def normalize(s, encoding, options):
     # This converts the various Python string types into a format that is
     # appropriate for .po files, namely much closer to C style,
     # while wrapping to options.width.
     lines = []
-    space_splitter = re.compile(r'(\s+)').split
     for line in s.splitlines(True):
         if len(escape(line, encoding)) > options.width:
             words = space_splitter(line)