From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 12 Nov 2015 07:56:14 +0000 (-0800)
Subject: pybind/rbd: decode stat() and list_children() results for py3
X-Git-Tag: v10.0.1~80^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddb1ee9ac03be5bbe982f42abde4221eed0ec39c;p=ceph.git

pybind/rbd: decode stat() and list_children() results for py3

For stat(), only block_name_prefix is filled in - parent and
parent_pool are always blank.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/pybind/rbd.py b/src/pybind/rbd.py
index 9f2f47f8c07b..5c681e9213f5 100644
--- a/src/pybind/rbd.py
+++ b/src/pybind/rbd.py
@@ -581,7 +581,7 @@ class Image(object):
             'obj_size'          : info.obj_size,
             'num_objs'          : info.num_objs,
             'order'             : info.order,
-            'block_name_prefix' : info.block_name_prefix,
+            'block_name_prefix' : decode_cstr(info.block_name_prefix),
             'parent_pool'       : info.parent_pool,
             'parent_name'       : info.parent_name
             }
@@ -1101,8 +1101,8 @@ written." % (self.name, ret, length))
                 raise make_ex(ret, 'error listing images')
         if ret == 0:
             return []
-        pools = c_pools.raw[:pools_size.value - 1].split('\0')
-        images = c_images.raw[:images_size.value - 1].split('\0')
+        pools = map(decode_cstr, c_pools.raw[:pools_size.value - 1].split(b'\0'))
+        images = map(decode_cstr, c_images.raw[:images_size.value - 1].split(b'\0'))
         return list(zip(pools, images))
 
     def list_lockers(self):