From: Varsha Rao <varao@redhat.com>
Date: Thu, 11 Apr 2019 07:03:12 +0000 (+0530)
Subject: cephfs-shell: Revert "cephfs.pyx: add py3 compatibility"
X-Git-Tag: v14.2.2~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28641%2Fhead;p=ceph.git

cephfs-shell: Revert "cephfs.pyx: add py3 compatibility"

This reverts commit 5106582fc7edae7f39161cf89e566c020fcfa0ce.

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

This revert was missing from #27531
---

diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx
index daef4a07cc5..98932fb9e9d 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):
         """