From: Kefu Chai <kchai@redhat.com>
Date: Mon, 22 Mar 2021 09:41:22 +0000 (+0800)
Subject: pybind/mgr/telegraf: drop python2 support
X-Git-Tag: v17.1.0~2475^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35233477ce0881fabb2607a100f7a17f13a66ca2;p=ceph.git

pybind/mgr/telegraf: drop python2 support

urlparse is offered by urllib.parse in python3, so no need to
catch the ImportError exception for python2.

and there is no need to add `u` prefix for unicode string in python3.

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

diff --git a/src/pybind/mgr/telegraf/module.py b/src/pybind/mgr/telegraf/module.py
index ca25fce7c738..d5041c88572b 100644
--- a/src/pybind/mgr/telegraf/module.py
+++ b/src/pybind/mgr/telegraf/module.py
@@ -9,10 +9,7 @@ from telegraf.basesocket import BaseSocket
 from telegraf.protocol import Line
 from mgr_module import MgrModule, PG_STATES
 
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
+from urllib.parse import urlparse
 
 
 class Module(MgrModule):
diff --git a/src/pybind/mgr/telegraf/protocol.py b/src/pybind/mgr/telegraf/protocol.py
index d243e0c1a021..80a25ff43ac9 100644
--- a/src/pybind/mgr/telegraf/protocol.py
+++ b/src/pybind/mgr/telegraf/protocol.py
@@ -20,7 +20,7 @@ class Line(object):
         sorted_values = sorted(metric_values.items())
         sorted_values = [(k, v) for k, v in sorted_values if v is not None]
 
-        return u','.join(u'{0}={1}'.format(format_string(k), format_value(v)) for k, v in sorted_values)
+        return ','.join('{0}={1}'.format(format_string(k), format_value(v)) for k, v in sorted_values)
 
     def get_output_tags(self):
         if not self.tags:
@@ -28,7 +28,7 @@ class Line(object):
 
         sorted_tags = sorted(self.tags.items())
 
-        return u','.join(u'{0}={1}'.format(format_string(k), format_string(v)) for k, v in sorted_tags)
+        return ','.join('{0}={1}'.format(format_string(k), format_string(v)) for k, v in sorted_tags)
 
     def get_output_timestamp(self):
         return ' {0}'.format(self.timestamp) if self.timestamp else ''
@@ -36,7 +36,7 @@ class Line(object):
     def to_line_protocol(self):
         tags = self.get_output_tags()
 
-        return u'{0}{1} {2}{3}'.format(
+        return '{0}{1} {2}{3}'.format(
             self.get_output_measurement(),
             "," + tags if tags else '',
             self.get_output_values(),