From f4b204004bcc820b9ef9a21d969a35071e7727ab Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Sun, 1 Mar 2015 21:52:20 +0100 Subject: [PATCH] rbd.py: fix pep8 E128 under-indented lines Signed-off-by: Danny Al-Gaaf --- src/pybind/rbd.py | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/pybind/rbd.py b/src/pybind/rbd.py index 7e0dd4a438224..5350dfb34d8e9 100644 --- a/src/pybind/rbd.py +++ b/src/pybind/rbd.py @@ -489,7 +489,8 @@ class Image(object): name = create_string_buffer(size) snapname = create_string_buffer(size) ret = self.librbd.rbd_get_parent_info(self.image, pool, len(pool), - name, len(name), snapname, len(snapname)) + name, len(name), snapname, + len(snapname)) if ret == -errno.ERANGE: size *= 2 @@ -719,14 +720,16 @@ class Image(object): :raises: :class:`InvalidArgument`, :class:`IOError` """ ret_buf = create_string_buffer(length) - if fadvise_flags == 0: - ret = self.librbd.rbd_read(self.image, c_uint64(offset), - c_size_t(length), byref(ret_buf)) - else: - ret = self.librbd.rbd_read2(self.image, c_uint64(offset), - c_size_t(length), byref(ret_buf), c_int(fadvise_flags)) + if fadvise_flags == 0: + ret = self.librbd.rbd_read(self.image, c_uint64(offset), + c_size_t(length), byref(ret_buf)) + else: + ret = self.librbd.rbd_read2(self.image, c_uint64(offset), + c_size_t(length), byref(ret_buf), + c_int(fadvise_flags)) if ret < 0: raise make_ex(ret, 'error reading %s %ld~%ld' % (self.image, offset, length)) + return ctypes.string_at(ret_buf, ret) def diff_iterate(self, offset, length, from_snapshot, iterate_cb): @@ -799,12 +802,14 @@ class Image(object): if not isinstance(data, str): raise TypeError('data must be a string') length = len(data) - if fadvise_flags == 0: - ret = self.librbd.rbd_write(self.image, c_uint64(offset), - c_size_t(length), c_char_p(data)) - else: - ret = self.librbd.rbd_write2(self.image, c_uint64(offset), - c_size_t(length), c_char_p(data), c_int(fadvise_flags)) + + if fadvise_flags == 0: + ret = self.librbd.rbd_write(self.image, c_uint64(offset), + c_size_t(length), c_char_p(data)) + else: + ret = self.librbd.rbd_write2(self.image, c_uint64(offset), + c_size_t(length), c_char_p(data), + c_int(fadvise_flags)) if ret == length: return ret -- 2.39.5