]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/test_orchestrator: drop python2 support
authorKefu Chai <kchai@redhat.com>
Sun, 19 Jul 2020 09:41:09 +0000 (17:41 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 22 Jul 2020 03:55:49 +0000 (11:55 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/test_orchestrator/module.py

index 83100ab9a11b06cfb0e72f83e89796ec72fb788c..a9076ec911fd67ee3da71fd729190b356a0936fa 100644 (file)
@@ -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):