diff options
author | Zuul <zuul@review.opendev.org> | 2021-04-28 07:46:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2021-04-28 07:46:46 +0000 |
commit | 9bc517aa274d41572da87c0ad60ac4ae9f086f64 (patch) | |
tree | 9a0eea3a49aac54085951b983074faa031105942 /designateclient/client.py | |
parent | f8353c5f03cdad448eb0ddade246fdf6ff92b494 (diff) | |
parent | 820f1e9af9317b91f3ee11a9ca22ea340119a125 (diff) | |
download | python-designateclient-9bc517aa274d41572da87c0ad60ac4ae9f086f64.tar.gz |
Merge "Remove six and update lower-constraints appdirs"4.3.0
Diffstat (limited to 'designateclient/client.py')
-rw-r--r-- | designateclient/client.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/designateclient/client.py b/designateclient/client.py index 27ac528..03564cb 100644 --- a/designateclient/client.py +++ b/designateclient/client.py @@ -16,17 +16,15 @@ import abc -import six -from six.moves.urllib import parse from stevedore import extension +from urllib import parse from oslo_serialization import jsonutils from designateclient import exceptions -@six.add_metaclass(abc.ABCMeta) -class Controller(object): +class Controller(object, metaclass=abc.ABCMeta): def __init__(self, client): self.client = client @@ -89,8 +87,7 @@ class Controller(object): return body -@six.add_metaclass(abc.ABCMeta) -class CrudController(Controller): +class CrudController(Controller, metaclass=abc.ABCMeta): @abc.abstractmethod def list(self, *args, **kw): @@ -132,6 +129,6 @@ def Client(version, *args, **kwargs): # noqa versions = get_versions() if version not in versions: msg = 'Version %s is not supported, use one of (%s)' % ( - version, list(six.iterkeys(versions))) + version, list(versions.keys())) raise exceptions.UnsupportedVersion(msg) return versions[version](*args, **kwargs) |