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

pybind/mgr/test_orchestrator: drop python2 support

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

diff --git a/src/pybind/mgr/test_orchestrator/module.py b/src/pybind/mgr/test_orchestrator/module.py
index 83100ab9a11b..a9076ec911fd 100644
--- a/src/pybind/mgr/test_orchestrator/module.py
+++ b/src/pybind/mgr/test_orchestrator/module.py
@@ -14,8 +14,6 @@ try:
 except ImportError:
     pass  # type checking
 
-import six
-
 from ceph.deployment import inventory
 from ceph.deployment.drive_group import DriveGroupSpec
 from mgr_module import CLICommand, HandleCommandResult
@@ -365,11 +363,11 @@ class TestOrchestrator(MgrModule, orchestrator.Orchestrator):
             raise orchestrator.NoOrchestrator()
         if host == 'raise_import_error':
             raise ImportError("test_orchestrator not enabled")
-        assert isinstance(host, six.string_types)
+        assert isinstance(host, str)
 
     @deferred_write("remove_host")
     def remove_host(self, host):
-        assert isinstance(host, six.string_types)
+        assert isinstance(host, str)
 
     @deferred_write("apply_mgr")
     def apply_mgr(self, spec):