From: Kefu Chai <kchai@redhat.com>
Date: Sun, 19 Jul 2020 09:40:48 +0000 (+0800)
Subject: pybind/mgr/rook: drop python2 support
X-Git-Tag: v16.1.0~1654^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5891b56ad6c7115e6a0a96e315456a799a5a5e88;p=ceph.git

pybind/mgr/rook: drop python2 support

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

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 05c533ae8576..6ee1c7d6d47e 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -14,7 +14,7 @@ from contextlib import contextmanager
 from time import sleep
 
 import jsonpatch
-from six.moves.urllib.parse import urljoin  # pylint: disable=import-error
+from urllib.parse import urljoin
 
 # Optional kubernetes imports to enable MgrModule.can_run
 # to behave cleanly.