Fix output of --list-locales to not be a bytes repr.

python-babel · Feb 26, 2022 · d94fd35 · d94fd35
1 parent 5ec19a6
commit d94fd35
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
@@ -893,9 +893,16 @@ def run(self, argv=None):
             for identifier in identifiers:
                 locale = Locale.parse(identifier)
                 output = format % (identifier, locale.english_name)
-                print(output.encode(sys.stdout.encoding or
-                                    getpreferredencoding() or
-                                    'ascii', 'replace'))
+                # Prevent errors on printing by doing an encode/decode
+                # roundtrip with errors='replace'.
+                encoding = (
+                    sys.stdout.encoding
+                    or getpreferredencoding()
+                    or 'ascii'
+                )
+                print(
+                    output.encode(encoding, errors='replace').decode(encoding)
+                )
             return 0
 
         if not args:

diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
@@ -762,11 +762,17 @@ def test_usage(self):
 """, sys.stderr.getvalue().lower())
 
     def test_list_locales(self):
+        """
+        Test the command with the --list-locales arg.
+        """
         result = self.cli.run(sys.argv + ['--list-locales'])
         self.assertEqual(0, result)
         output = sys.stdout.getvalue()
         for line in output.splitlines():
-            self.assertRegex(line, r"b'[0-9A-Za-z_]{2,}\s+[0-9A-Za-z,&\\\-\.() ]+'")
+            self.assertRegex(
+                line,
+                r"[0-9A-Za-z_]{2,}\s+[0-9A-Za-z,&\\\-\.() ]+",
+            )
 
     def _run_init_catalog(self):
         i18n_dir = os.path.join(data_dir, 'project', 'i18n')