]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/restful: drop py2 support
authorKefu Chai <kchai@redhat.com>
Sun, 28 Jun 2020 12:53:03 +0000 (20:53 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 5 Jul 2020 02:58:29 +0000 (10:58 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/restful/module.py

index 8ec2524285f23c6f5321f9cbfc69bde8c09bd4cf..b5f9d6f0af9b28e10045b296652be70be9b4cb19 100644 (file)
@@ -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):