]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: cast output of subprocess.Popen() to str()
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 20 Mar 2013 13:36:58 +0000 (14:36 +0100)
committerSage Weil <sage@inktank.com>
Fri, 26 Apr 2013 20:40:05 +0000 (13:40 -0700)
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)

src/ceph-disk

index 7de946e29856ed8602c2a6c7da482bdc402ca6a5..7804021580a4650a14f287d9bc0501c852d2511e 100755 (executable)
@@ -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])