aboutsummaryrefslogtreecommitdiff
path: root/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-04-16 21:30:14 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-04-16 21:30:14 +0300
commit668d679c01175e8a8e5a300fd657c333ab151d43 (patch)
treebaf059e99a4e446ea55d89ef9cf1467a122960a9 /interpreter.py
parent6579af34f3e0b4b93c2269f24613aefc48e419b7 (diff)
downloadmeson-668d679c01175e8a8e5a300fd657c333ab151d43.zip
meson-668d679c01175e8a8e5a300fd657c333ab151d43.tar.gz
meson-668d679c01175e8a8e5a300fd657c333ab151d43.tar.bz2
Some windows cleanups.
Diffstat (limited to 'interpreter.py')
-rw-r--r--interpreter.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/interpreter.py b/interpreter.py
index d09622a..7328cba 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -68,8 +68,8 @@ class RunProcess(InterpreterObject):
pc = self.run_command(command_array, source_dir, build_dir, subdir)
(stdout, stderr) = pc.communicate()
self.returncode = pc.returncode
- self.stdout = stdout.decode()
- self.stderr = stderr.decode()
+ self.stdout = stdout.decode().replace('\r\n', '\n')
+ self.stderr = stderr.decode().replace('\r\n', '\n')
self.methods.update({'returncode' : self.returncode_method,
'stdout' : self.stdout_method,
'stderr' : self.stderr_method,
@@ -1266,7 +1266,6 @@ class Interpreter():
s = posargs[0]
if not isinstance(s, str):
raise InterpreterException('Split() argument must be a string')
- print(obj.split(s))
return obj.split(s)
else:
return obj.split()