aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-11-03 00:13:15 -0400
committerEli Schwartz <eschwartz@archlinux.org>2022-11-03 15:44:41 -0400
commitaf41eb6e9b98a0611f870b9c01707f3428ee3704 (patch)
tree53ed91baad13fb7b3c5ae9058dd45c3d53a7a815
parent608a6196a0ce1bebf66c5ac0cc38a20bfddede9b (diff)
downloadmeson-af41eb6e9b98a0611f870b9c01707f3428ee3704.zip
meson-af41eb6e9b98a0611f870b9c01707f3428ee3704.tar.gz
meson-af41eb6e9b98a0611f870b9c01707f3428ee3704.tar.bz2
squelch an EncodingWarning we don't care about
We would like to use the default value (the one python urged us not to use), but without getting a warning for it. Luckily, we have the correct value already, so we can pass it manually to avoid the complaint.
-rw-r--r--mesonbuild/utils/universal.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
index 0c611bb..570edd6 100644
--- a/mesonbuild/utils/universal.py
+++ b/mesonbuild/utils/universal.py
@@ -1416,7 +1416,7 @@ def Popen_safe(args: T.List[str], write: T.Optional[str] = None,
if not sys.stdout.encoding or encoding.upper() != 'UTF-8':
p, o, e = Popen_safe_legacy(args, write=write, stdin=stdin, stdout=stdout, stderr=stderr, **kwargs)
else:
- p = subprocess.Popen(args, universal_newlines=True, close_fds=False,
+ p = subprocess.Popen(args, universal_newlines=True, encoding=encoding, close_fds=False,
stdin=stdin, stdout=stdout, stderr=stderr, **kwargs)
o, e = p.communicate(write)
# Sometimes the command that we run will call another command which will be