Refs #30116 -- Simplified stdout/stderr decoding with subprocess.run()'s encoding argument.

The encoding argument has been available since Python 3.6.
https://docs.python.org/3/library/subprocess.html#subprocess.run

2 files changed, 10 insertions, 7 deletions

diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py
index bf4cb79ad1..e67bf6e74d 100644
--- a/scripts/manage_translations.py
+++ b/scripts/manage_translations.py
@@ -124,14 +124,17 @@ def lang_stats(resources=None, languages=None):
             p = run(
                 ['msgfmt', '-vc', '-o', '/dev/null', po_path],
                 stdout=PIPE, stderr=PIPE,
-                env={'LANG': 'C'}
+                env={'LANG': 'C'},
+                encoding='utf-8',
             )
             if p.returncode == 0:
                 # msgfmt output stats on stderr
-                print("%s: %s" % (lang, p.stderr.decode().strip()))
+                print('%s: %s' % (lang, p.stderr.strip()))
             else:
-                print("Errors happened when checking %s translation for %s:\n%s" % (
-                    lang, name, p.stderr.decode()))
+                print(
+                    'Errors happened when checking %s translation for %s:\n%s'
+                    % (lang, name, p.stderr)
+                )
 
 
 def fetch(resources=None, languages=None):
diff --git a/tests/postgres_tests/test_integration.py b/tests/postgres_tests/test_integration.py
index da3ccb028d..db082a6495 100644
--- a/tests/postgres_tests/test_integration.py
+++ b/tests/postgres_tests/test_integration.py
@@ -16,7 +16,7 @@ class PostgresIntegrationTests(PostgreSQLSimpleTestCase):
             stdout=subprocess.DEVNULL,
             stderr=subprocess.PIPE,
             cwd=os.path.dirname(__file__),
-            env=test_environ
+            env=test_environ,
+            encoding='utf-8',
         )
-        stderr = '\n'.join([e.decode() for e in result.stderr.splitlines()])
-        self.assertEqual(result.returncode, 0, msg=stderr)
+        self.assertEqual(result.returncode, 0, msg=result.stderr)