]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr: replace iteritems with six.iteritems (status)
authorNathan Cutler <ncutler@suse.com>
Thu, 5 Jul 2018 15:23:24 +0000 (17:23 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 5 Jul 2018 15:40:18 +0000 (17:40 +0200)
Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/pybind/mgr/status/module.py

index c746403c2de97ec8c929cbd1bb88a51d16c8e151..8f9ae0d16876fa4e2277624e9a4df17efa278940 100644 (file)
@@ -5,9 +5,10 @@ High level status display commands
 
 from collections import defaultdict
 from prettytable import PrettyTable
-import prettytable
-import fnmatch
 import errno
+import fnmatch
+import prettytable
+import six
 
 from mgr_module import MgrModule
 
@@ -187,7 +188,7 @@ class Module(MgrModule):
                     ])
 
             # Find the standby replays
-            for gid_str, daemon_info in mdsmap['info'].iteritems():
+            for gid_str, daemon_info in six.iteritems(mdsmap['info']):
                 if daemon_info['state'] != "up:standby-replay":
                     continue
 
@@ -242,7 +243,7 @@ class Module(MgrModule):
             output += "MDS version: {0}".format(mds_versions.keys()[0])
         else:
             version_table = PrettyTable(["version", "daemons"])
-            for version, daemons in mds_versions.iteritems():
+            for version, daemons in six.iteritems(mds_versions):
                 version_table.add_row([
                     version,
                     ", ".join(daemons)