]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
pybind/mgr/orchestrator: drop python2 support
authorKefu Chai <kchai@redhat.com>
Sun, 19 Jul 2020 09:40:36 +0000 (17:40 +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/orchestrator/module.py

index 93e7b97bfaa10b1e254699576045c90bd0a77d66..f1ba904fcce42cd1ee30ce4ba67ace3459b8e702 100644 (file)
@@ -6,7 +6,6 @@ import re
 import ast
 
 import yaml
-import six
 from prettytable import PrettyTable
 
 from ceph.deployment.inventory import Device
@@ -69,9 +68,8 @@ def to_format(what, format: str, many: bool, cls):
         return yaml.dump(to_yaml(copy), default_flow_style=False)
 
 
-
-@six.add_metaclass(CLICommandMeta)
-class OrchestratorCli(OrchestratorClientMixin, MgrModule):
+class OrchestratorCli(OrchestratorClientMixin, MgrModule,
+                      metaclass=CLICommandMeta):
     MODULE_OPTIONS = [
         {
             'name': 'orchestrator',