diff options
author | Lars Wirzenius <liw@liw.fi> | 2017-08-20 10:00:11 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2017-08-20 10:00:11 +0300 |
commit | ab151acc806b8289f14794a80cba63d4ee634c27 (patch) | |
tree | 84e9285ca5b715bde860c33a3fb99697c7dc7b21 /cliapp/runcmd.py | |
parent | 70dda47e3b33ebc432131aa65e6cb3f17b7c2eb3 (diff) | |
download | cliapp-ab151acc806b8289f14794a80cba63d4ee634c27.tar.gz |
Fix: more Python3 support from Stuart
These changes were sent by Stuart Prescott, but since I am stupid and
hadn't pushed my changes to the git server, his patches didn't apply
with "git am", and so his commit info got lost.
Diffstat (limited to 'cliapp/runcmd.py')
-rw-r--r-- | cliapp/runcmd.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cliapp/runcmd.py b/cliapp/runcmd.py index a14fa72..7123fed 100644 --- a/cliapp/runcmd.py +++ b/cliapp/runcmd.py @@ -272,7 +272,7 @@ def _run_pipeline(procs, feed_stdin, pipe_stdin, pipe_stdout, pipe_stderr, procs[-1].stderr.close() if procs[-1].stdout is not None: procs[-1].stdout.close() - return errorcodes[-1], ''.join(out), ''.join(err) + return errorcodes[-1], b''.join(out), b''.join(err) def shell_quote(s): |