diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-util/meson/files | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'dev-util/meson/files')
-rw-r--r-- | dev-util/meson/files/meson-0.49-python3.5-tests.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch new file mode 100644 index 000000000000..640348b2bc2d --- /dev/null +++ b/dev-util/meson/files/meson-0.49-python3.5-tests.patch @@ -0,0 +1,34 @@ +From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <smcv@collabora.com> +Date: Fri, 11 Jan 2019 18:03:15 +0000 +Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess + invocation + +subprocess.run() didn't get the encoding parameter until 3.6. + +Signed-off-by: Simon McVittie <smcv@collabora.com> +--- + run_unittests.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/run_unittests.py b/run_unittests.py +index 342ad883..e1246140 100755 +--- a/run_unittests.py ++++ b/run_unittests.py +@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests): + ret = subprocess.run( + ["{}"] + extra_args, + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE, +- encoding='utf-8') +- print(ret.stdout) +- print(ret.stderr, file=sys.stderr) ++ stderr=subprocess.PIPE) ++ print(ret.stdout.decode('utf-8')) ++ print(ret.stderr.decode('utf-8'), file=sys.stderr) + sys.exit(ret.returncode) + + if __name__ == '__main__': +-- +2.21.0 + |