]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs.pyx: add py3 compatibility
authorRishabh Dave <ridave@redhat.com>
Wed, 16 May 2018 19:06:42 +0000 (19:06 +0000)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 27 Sep 2018 23:25:17 +0000 (16:25 -0700)
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 5106582fc7edae7f39161cf89e566c020fcfa0ce)

src/pybind/cephfs/cephfs.pyx

index 3f106c4dfc6a9922a97b8d8272b5281b595d3cc1..fe927d2843d9a1e5179537e098c8b91ca2e7c274 100644 (file)
@@ -598,11 +598,13 @@ cdef class LibCephFS(object):
         if not dirent:
             return None
 
+        d_name = dirent.d_name if sys.version[0:2] == '2.' else dirent.d_name.\
+                 decode()
         return DirEntry(d_ino=dirent.d_ino,
                         d_off=dirent.d_off,
                         d_reclen=dirent.d_reclen,
                         d_type=dirent.d_type,
-                        d_name=dirent.d_name)
+                        d_name=d_name)
 
     def closedir(self, DirResult dir_handler):
         self.require_state("mounted")