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

pybind/mgr/cephadm: drop python2 support

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 73459d3f2336..7e90404aad89 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -12,7 +12,6 @@ from typing import List, Dict, Optional, Callable, Tuple, TypeVar, \
     Any, Set, TYPE_CHECKING, cast, Iterator
 
 import datetime
-import six
 import os
 import random
 import tempfile
@@ -135,8 +134,8 @@ def trivial_completion(f: Callable) -> Callable[..., CephadmCompletion]:
     return wrapper
 
 
-@six.add_metaclass(CLICommandMeta)
-class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
+class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
+                          metaclass=CLICommandMeta):
 
     _STORE_HOST_PREFIX = "host"