ceph-volume: process: decode non-str streams from subprocess

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/src/ceph-volume/ceph_volume/process.py b/src/ceph-volume/ceph_volume/process.py
index 7ba14da72979691677c03f2ca2386360d5f09377..5008bc490c2d91de9feca6271ea0a783f1c301f2 100644 (file)
--- a/src/ceph-volume/ceph_volume/process.py
+++ b/src/ceph-volume/ceph_volume/process.py
@@ -124,8 +124,14 @@ def call(command, **kw):
     )
 
     returncode = process.wait()
-    stdout = process.stdout.read().splitlines()
-    stderr = process.stderr.read().splitlines()
+    stdout_stream = process.stdout.read()
+    stderr_stream = process.stderr.read()
+    if not isinstance(stdout_stream, str):
+        stdout_stream = stdout_stream.decode('utf-8')
+    if not isinstance(stderr_stream, str):
+        stderr_stream = stderr_stream.decode('utf-8')
+    stdout = stdout_stream.splitlines()
+    stderr = stderr_stream.splitlines()
 
     # the following can get a messed up order in the log if the system call
     # returns output with both stderr and stdout intermingled. This separates