From 9fb36625a408cc941c20e64fa9f3aace01f6e58b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 19 Jul 2020 17:40:36 +0800 Subject: [PATCH] pybind/mgr/orchestrator: drop python2 support Signed-off-by: Kefu Chai --- src/pybind/mgr/orchestrator/module.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 93e7b97bfaa10..f1ba904fcce42 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -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', -- 2.39.5