From 86bd6432d6080b1c7bd20f26ff9f0ed44cc926f8 Mon Sep 17 00:00:00 2001 From: Ricardo Dias Date: Fri, 23 Mar 2018 14:51:44 +0000 Subject: [PATCH] pybind/rbd: fix python 3 str to bytes problems Fixes: http://tracker.ceph.com/issues/23609 Signed-off-by: Ricardo Dias (cherry picked from commit 72dc17ce327dc6422a2d62348b2c42971d364b6b) Conflicts: src/pybind/rbd/rbd.pyx (deep_copy not in luminous) --- src/pybind/rbd/rbd.pyx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx index df90e3ab59b69..5fd8e63ce5032 100644 --- a/src/pybind/rbd/rbd.pyx +++ b/src/pybind/rbd/rbd.pyx @@ -519,7 +519,9 @@ def cstr(val, name, encoding="utf-8", opt=False): return None if isinstance(val, bytes): return val - elif isinstance(val, unicode): + elif isinstance(val, str): + return val.encode(encoding) + elif sys.version_info < (3, 0) and isinstance(val, unicode): return val.encode(encoding) else: raise InvalidArgument('%s must be a string' % name) @@ -704,6 +706,7 @@ class RBD(object): :raises: :class:`FunctionNotSupported` """ name = cstr(name, 'name') + data_pool = cstr(data_pool, 'data_pool', opt=True) cdef: rados_ioctx_t _ioctx = convert_ioctx(ioctx) char *_name = name @@ -787,6 +790,7 @@ class RBD(object): p_snapname = cstr(p_snapname, 'p_snapname') p_name = cstr(p_name, 'p_name') c_name = cstr(c_name, 'c_name') + data_pool = cstr(data_pool, 'data_pool', opt=True) cdef: rados_ioctx_t _p_ioctx = convert_ioctx(p_ioctx) rados_ioctx_t _c_ioctx = convert_ioctx(c_ioctx) @@ -1737,6 +1741,7 @@ cdef class Image(object): :raises: :class:`ArgumentOutOfRange` """ dest_name = cstr(dest_name, 'dest_name') + data_pool = cstr(data_pool, 'data_pool', opt=True) cdef: rados_ioctx_t _dest_ioctx = convert_ioctx(dest_ioctx) char *_dest_name = dest_name -- 2.39.5