Merge pull request ceph#6711 from jdurgin/wip-13880

pybind: decode empty string in conf_parse_argv() correctly

Reviewed-by: Kefu Chai <[email protected]>

src/pybind/rados.py

@@ -433,8 +433,7 @@ def conf_parse_argv(self, args):
 
         # cretargs was allocated with fixed length; collapse return
         # list to eliminate any missing args
-
-        retargs = [decode_cstr(a) for a in cretargs if a is not None]
+        retargs = [a.decode('utf-8') for a in cretargs if a is not None]
         self.parsed_args = args
         return retargs
 

src/test/pybind/test_rados.py

@@ -33,6 +33,11 @@ def test_ioctx_context_manager():
         with conn.open_ioctx('rbd') as ioctx:
             pass
 
+def test_parse_argv_empty_str():
+    args = ['']
+    r = Rados()
+    eq(args, r.conf_parse_argv(args))
+
 class TestRequires(object):
     @requires(('foo', str), ('bar', int), ('baz', int))
     def _method_plain(self, foo, bar, baz):