mgr: replace iteritems with six.iteritems (restful)

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c02c6601755efbe5fb06021d314d5b2d8aa6c79e)

Conflicts:
	src/pybind/mgr/restful/module.py (trivial)

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index 13d020d1258a9011cbb78f72f6c5ea1266a578da..5832081d19361f6139283e4578f67f0de5df0543 100644 (file)
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -10,6 +10,7 @@ import inspect
 import tempfile
 import threading
 import traceback
+import six
 import socket
 
 import common
@@ -24,11 +25,6 @@ from hooks import ErrorHook
 from mgr_module import MgrModule, CommandResult
 
 
-try:
-    iteritems = dict.iteritems
-except:
-    iteritems = dict.items
-
 # Global instance to share
 instance = None
 
@@ -266,7 +262,7 @@ class Module(MgrModule):
     def refresh_keys(self):
         self.keys = {}
         rawkeys = self.get_config_prefix('keys/') or {}
-        for k, v in iteritems(rawkeys):
+        for k, v in six.iteritems(rawkeys):
             self.keys[k[5:]] = v  # strip of keys/ prefix
 
     def _serve(self):