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

pybind/mgr/orchestrator: drop python2 support

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

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 93e7b97bfaa1..f1ba904fcce4 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',