From 5866377ec39a3f0954afc8b0a3a8a544f188f307 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 5 Jul 2018 17:23:24 +0200 Subject: [PATCH] mgr: replace iteritems with six.iteritems (status) Fixes: http://tracker.ceph.com/issues/24779 Signed-off-by: Nathan Cutler --- src/pybind/mgr/status/module.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/status/module.py b/src/pybind/mgr/status/module.py index c746403c2de..8f9ae0d1687 100644 --- a/src/pybind/mgr/status/module.py +++ b/src/pybind/mgr/status/module.py @@ -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) -- 2.47.3