From: Kefu Chai <kchai@redhat.com>
Date: Sun, 28 Jun 2020 12:53:22 +0000 (+0800)
Subject: pybind/mgr/status: drop py2 support
X-Git-Tag: wip-pdonnell-testing-20200918.022351~781^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63b80c514cd424cdedfef6b8f0c1f522cbb37051;p=ceph-ci.git

pybind/mgr/status: drop py2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/status/module.py b/src/pybind/mgr/status/module.py
index c48a85699a1..89dde22f9e7 100644
--- a/src/pybind/mgr/status/module.py
+++ b/src/pybind/mgr/status/module.py
@@ -9,7 +9,6 @@ import errno
 import fnmatch
 import mgr_util
 import prettytable
-import six
 import json
 
 from mgr_module import MgrModule, HandleCommandResult
@@ -147,7 +146,7 @@ class Module(MgrModule):
                         ])
 
             # Find the standby replays
-            for gid_str, daemon_info in six.iteritems(mdsmap['info']):
+            for gid_str, daemon_info in mdsmap['info'].items():
                 if daemon_info['state'] != "up:standby-replay":
                     continue
 
@@ -257,7 +256,7 @@ class Module(MgrModule):
                                         border=False)
             version_table.left_padding_width = 0
             version_table.right_padding_width = 2
-            for version, daemons in six.iteritems(mds_versions):
+            for version, daemons in mds_versions.items():
                 if output_format in ('json', 'json-pretty'):
                     json_output['mds_version'].append({
                         'version': version,