]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs-shell: Revert "cephfs.pyx: add py3 compatibility" 28641/head
authorVarsha Rao <varao@redhat.com>
Thu, 11 Apr 2019 07:03:12 +0000 (12:33 +0530)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 19 Jun 2019 03:28:40 +0000 (20:28 -0700)
This reverts commit 5106582fc7edae7f39161cf89e566c020fcfa0ce.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 417836de308a8b642fec5f03d819800142155b34)

This revert was missing from #27531

src/pybind/cephfs/cephfs.pyx

index daef4a07cc55c96c999802d9f83510ecb54c466b..98932fb9e9d56029d54e5e9966251fb660056280 100644 (file)
@@ -722,13 +722,11 @@ 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=d_name)
+                        d_name=dirent.d_name)
 
     def closedir(self, DirResult dir_handler):
         """