From: Kefu Chai <kchai@redhat.com>
Date: Sun, 28 Jun 2020 12:52:11 +0000 (+0800)
Subject: pybind/mgr/influx: drop py2 support
X-Git-Tag: wip-pdonnell-testing-20200918.022351~781^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac8bd21e90813ccbcea21d33f3ef61cfece84b03;p=ceph-ci.git

pybind/mgr/influx: drop py2 support

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

diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index 14c79d3fe74..e54ca1f0024 100644
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -2,12 +2,9 @@ from contextlib import contextmanager
 from datetime import datetime
 from threading import Event, Thread
 from itertools import chain
-from six import next
-from six.moves import queue
-from six.moves import xrange as range
+import queue
 import json
 import errno
-import six
 import time
 
 from mgr_module import MgrModule
@@ -214,7 +211,7 @@ class Module(MgrModule):
     def get_pg_summary_osd(self, pool_info, now):
         pg_sum = self.get('pg_summary')
         osd_sum = pg_sum['by_osd']
-        for osd_id, stats in six.iteritems(osd_sum):
+        for osd_id, stats in osd_sum.items():
             metadata = self.get_metadata('osd', "%s" % osd_id)
             if not metadata:
                 continue
@@ -235,7 +232,7 @@ class Module(MgrModule):
 
     def get_pg_summary_pool(self, pool_info, now):
         pool_sum = self.get('pg_summary')['by_pool']
-        for pool_id, stats in six.iteritems(pool_sum):
+        for pool_id, stats in pool_sum.items():
             for stat in stats:
                 yield {
                     "measurement": "ceph_pg_summary_pool",
@@ -251,7 +248,7 @@ class Module(MgrModule):
                 }
 
     def get_daemon_stats(self, now):
-        for daemon, counters in six.iteritems(self.get_all_perf_counters()):
+        for daemon, counters in self.get_all_perf_counters().items():
             svc_type, svc_id = daemon.split(".", 1)
             metadata = self.get_metadata(svc_type, svc_id)