From 58369c0063173404dc76f68dee1a45f169c2bdbb Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Thu, 11 Apr 2019 12:33:12 +0530 Subject: [PATCH] cephfs-shell: Revert "cephfs.pyx: add py3 compatibility" This reverts commit 5106582fc7edae7f39161cf89e566c020fcfa0ce. Signed-off-by: Varsha Rao (cherry picked from commit 417836de308a8b642fec5f03d819800142155b34) This revert was missing from #27531 --- src/pybind/cephfs/cephfs.pyx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx index daef4a07cc55c..98932fb9e9d56 100644 --- a/src/pybind/cephfs/cephfs.pyx +++ b/src/pybind/cephfs/cephfs.pyx @@ -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): """ -- 2.47.3