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

index 73459d3f2336b265f7f6fab9ee4664e35c66ee20..7e90404aad892fa5cb55cbc631c3638189abd14e 100644 (file)
@@ -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"