From c91f6ffd20dda83c0a58d12976f65ab2d87f429c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 19 Jul 2020 17:41:09 +0800 Subject: [PATCH] pybind/mgr/test_orchestrator: drop python2 support Signed-off-by: Kefu Chai --- src/pybind/mgr/test_orchestrator/module.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/test_orchestrator/module.py b/src/pybind/mgr/test_orchestrator/module.py index 83100ab9a11..a9076ec911f 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): -- 2.39.5