From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 4 Jan 2016 16:55:37 +0000 (+0100)
Subject: FDroidPopen: return str again
X-Git-Tag: 0.7.0~86^2~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5026d4e08b17432e67770a5c2e47c3507ae2b240;p=fdroidserver.git

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.
---

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)