]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/status: drop py2 support
authorKefu Chai <kchai@redhat.com>
Sun, 28 Jun 2020 12:53:22 +0000 (20:53 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 5 Jul 2020 02:58:29 +0000 (10:58 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/status/module.py

index c48a85699a168979ab28f3cd582d09261921b188..89dde22f9e75c405d81c4696259918f1f5ffd82d 100644 (file)
@@ -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,