From 5026d4e08b17432e67770a5c2e47c3507ae2b240 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 4 Jan 2016 17:55:37 +0100 Subject: [PATCH] FDroidPopen: return str again In the future we might want to instead return bytes, but for now the easiest for the port to python3 is to continue to return str. --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index e5b38c67..ed8fa1f9 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1672,9 +1672,9 @@ def FDroidPopen(commands, cwd=None, output=True, stderr_to_stdout=True): line = stdout_queue.get() if output and options.verbose: # Output directly to console - sys.stderr.write(line) + sys.stderr.buffer.write(line) sys.stderr.flush() - result.output += line + result.output += line.decode('utf-8') time.sleep(0.1) -- 2.30.2