From: Kefu Chai <kchai@redhat.com>
Date: Sun, 28 Jun 2020 12:53:03 +0000 (+0800)
Subject: pybind/mgr/restful: drop py2 support
X-Git-Tag: v17.0.0~1876^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=06a551d99e0819cf566e77cb29631b46a625c353;p=ceph.git

pybind/mgr/restful: drop py2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index 8ec2524285f23..b5f9d6f0af9b2 100644
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -11,7 +11,6 @@ import inspect
 import tempfile
 import threading
 import traceback
-import six
 import socket
 import fcntl
 
@@ -22,7 +21,6 @@ from uuid import uuid4
 from pecan import jsonify, make_app
 from OpenSSL import crypto
 from pecan.rest import RestController
-from six import iteritems
 from werkzeug.serving import make_server, make_ssl_devcert
 
 from .hooks import ErrorHook
@@ -264,7 +262,7 @@ class Module(MgrModule):
     def refresh_keys(self):
         self.keys = {}
         rawkeys = self.get_store_prefix('keys/') or {}
-        for k, v in six.iteritems(rawkeys):
+        for k, v in rawkeys.items():
             self.keys[k[5:]] = v  # strip of keys/ prefix
 
     def _serve(self):