From 7217620e23db78ed832e3e81b1deb54b5f28b0ed Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 15 Jul 2016 23:07:21 +0530 Subject: interpretor: Use the stdout/stderr locale to decode to string (#638) Fixes a decode error with locales other than en_US on Windows --- mesonbuild/interpreter.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index df4cb0d..2fd835f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -120,8 +120,14 @@ class RunProcess(InterpreterObject): pc = self.run_command(command_array, source_dir, build_dir, subdir, in_builddir) (stdout, stderr) = pc.communicate() self.returncode = pc.returncode - self.stdout = stdout.decode().replace('\r\n', '\n') - self.stderr = stderr.decode().replace('\r\n', '\n') + if sys.stdout.encoding: + self.stdout = stdout.decode(encoding=sys.stdout.encoding, errors='ignore').replace('\r\n', '\n') + else: + self.stdout = stdout.decode(errors='ignore').replace('\r\n', '\n') + if sys.stderr.encoding: + self.stderr = stderr.decode(encoding=sys.stderr.encoding, errors='ignore').replace('\r\n', '\n') + else: + self.stderr = stderr.decode(errors='ignore').replace('\r\n', '\n') self.methods.update({'returncode' : self.returncode_method, 'stdout' : self.stdout_method, 'stderr' : self.stderr_method, -- cgit v1.1