diff options
author | Zachary Turner <zturner@google.com> | 2015-11-05 01:33:44 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2015-11-05 01:33:44 +0000 |
commit | 5167115cf63b88e2139ebf1499d9185cdbeae4ac (patch) | |
tree | 73ae360847e09ff5fab59b5a15fc5f0801c0ffa9 /lldb/packages/Python/lldbsuite/test | |
parent | edcc92a4c10ad69317d80f432905260fefd386a0 (diff) | |
download | bcm5719-llvm-5167115cf63b88e2139ebf1499d9185cdbeae4ac.tar.gz bcm5719-llvm-5167115cf63b88e2139ebf1499d9185cdbeae4ac.zip |
Python 3 - Use universal_newlines=True in subprocess.Popen.
This follows the spirit of a previous patch which did essentially
the same thing. In Python 3, when you use Popen.communicate(),
you get back a bytes object which cannot normally be treated as
a string. We could decode this manually, but universal_newlines=True
does this automatically, and there's no disadvantage to doing so
even on Python 2. So just enable it always.
llvm-svn: 252126
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py b/lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py index 50bcdab33c5..4e8f554e37f 100644 --- a/lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py +++ b/lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py @@ -271,6 +271,7 @@ class UnixProcessHelper(ProcessHelper): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, + universal_newlines=True, # Elicits automatic byte -> string decoding in Py3 close_fds=True, preexec_fn=preexec_func) @@ -383,6 +384,7 @@ class WindowsProcessHelper(ProcessHelper): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, + universal_newlines=True, # Elicits automatic byte -> string decoding in Py3 creationflags=creation_flags) def was_hard_terminate(self, returncode): |