From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 20 Mar 2013 13:36:58 +0000 (+0100)
Subject: ceph-disk: cast output of subprocess.Popen() to str()
X-Git-Tag: v0.56.5~5^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e92baf5081a43ff3290eb934612a11fbed946469;p=ceph.git

ceph-disk: cast output of subprocess.Popen() to str()

Cast output of subprocess.Popen() to str() to be able to use
str.split() and str.splitlines() without warnings from pylint.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 87691dc46edfba11c370592dbb533772190be4b2)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 7de946e29856..7804021580a4 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -373,7 +373,7 @@ def get_conf(cluster, variable):
         return None
     elif ret != 0:
         raise Error('getting variable from configuration failed')
-    value = out.split('\n', 1)[0]
+    value = str(out).split('\n', 1)[0]
     # don't differentiate between "var=" and no var set
     if not value:
         return None
@@ -406,7 +406,7 @@ def get_conf_with_default(cluster, variable):
             e,
             )
 
-    value = out.split('\n', 1)[0]
+    value = str(out).split('\n', 1)[0]
     return value
 
 
@@ -552,7 +552,7 @@ def get_free_partition_index(dev):
 
     if not lines:
         raise Error('parted failed to output anything')
-    lines = lines.splitlines(True)
+    lines = str(lines).splitlines(True)
 
     if lines[0] not in ['CHS;\n', 'CYL;\n', 'BYT;\n']:
         raise Error('weird parted units', lines[0])