]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybinding: python3 fixes 8331/head
authorMehdi Abaakouk <sileht@redhat.com>
Mon, 28 Mar 2016 13:38:45 +0000 (15:38 +0200)
committerMehdi Abaakouk <sileht@redhat.com>
Mon, 28 Mar 2016 17:02:47 +0000 (19:02 +0200)
This fixes a couple of issues to make test_rados.py passed again against
python 3

Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
src/pybind/rados/rados.pyx
src/test/pybind/test_rados.py

index 86a4cb8967b584f854c6e77ccdba0066b8bb696f..1f2a049a68a412d77eb6fb2d214a73f2e9471209 100644 (file)
@@ -2025,7 +2025,7 @@ cdef class Ioctx(object):
 
         :raises: IoctxStateError
         """
-        if self.state != b"open":
+        if self.state != "open":
             raise IoctxStateError("The pool is %s" % self.state)
 
     def change_auid(self, auid):
index c1ce5fc6ebced5998ac8123ee80e24da06a87616..cfa5b88564ad16adae77b40f91dc368e76209cef 100644 (file)
@@ -448,12 +448,12 @@ class TestIoctx(object):
         with ReadOpCtx(self.ioctx) as read_op:
             iter, ret = self.ioctx.get_omap_vals(read_op, "", "", 4)
             self.ioctx.operate_read_op(read_op, "hw")
-            iter.next()
+            next(iter)
             eq(list(iter), [("2", b"bbb"), ("3", b"ccc"), ("4", b"\x04\x04\x04\x04")])
         with ReadOpCtx(self.ioctx) as read_op:
             iter, ret = self.ioctx.get_omap_vals(read_op, "2", "", 4)
             self.ioctx.operate_read_op(read_op, "hw")
-            eq(("3", b"ccc"), iter.next())
+            eq(("3", b"ccc"), next(iter))
             eq(list(iter), [("4", b"\x04\x04\x04\x04")])
         with ReadOpCtx(self.ioctx) as read_op:
             iter, ret = self.ioctx.get_omap_vals(read_op, "", "2", 4)