RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr: replace iteritems with six.iteritems (restful)

Browse Source 
Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2018-07-05 17:22:16 +02:00
parent a62ab8ae8c
commit c02c660175
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pybind/mgr/restful/module.py
View File

@ -11,6 +11,7 @@ import inspect
import tempfile
import threading
import traceback
import six
import socket
from . import common
@ -26,12 +27,6 @@ from .hooks import ErrorHook
from mgr_module import MgrModule, CommandResult
try:
iteritems = dict.iteritems
except:
iteritems = dict.items
class CannotServe(Exception):
pass
@ -270,7 +265,7 @@ class Module(MgrModule):
def refresh_keys(self):
self.keys = {}
rawkeys = self.get_store_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):