diff --git a/adjutantclient/common/base.py b/adjutantclient/common/base.py index e40b080..a60bfeb 100644 --- a/adjutantclient/common/base.py +++ b/adjutantclient/common/base.py @@ -21,11 +21,10 @@ Base utilities to build API operation managers and objects on top of. """ import abc import copy -import six from oslo_utils import reflection from oslo_utils import strutils -from six.moves.urllib import parse +from urllib import parse from adjutantclient._i18n import _ from adjutantclient import exc as exceptions @@ -207,8 +206,7 @@ class BaseManager(HookableMixin): return self.client.delete(url) -@six.add_metaclass(abc.ABCMeta) -class ManagerWithFind(BaseManager): +class ManagerWithFind(BaseManager, metaclass=abc.ABCMeta): """Manager with additional `find()`/`findall()` methods.""" @abc.abstractmethod diff --git a/adjutantclient/osc/v1/quota.py b/adjutantclient/osc/v1/quota.py index f926a30..ad98caa 100644 --- a/adjutantclient/osc/v1/quota.py +++ b/adjutantclient/osc/v1/quota.py @@ -13,7 +13,6 @@ # under the License. import logging -import six from osc_lib.command import command from osc_lib.i18n import _ @@ -61,9 +60,8 @@ class QuotaShow(command.Lister): region = quota_data['regions'][0] rows = [] - for service, service_detail in six.iteritems( - region['current_usage']): - for resource, value in six.iteritems(service_detail): + for service, service_detail in region['current_usage'].items(): + for resource, value in service_detail.items(): current_quota = region['current_quota'][service].get( resource) rows.append([service, resource, current_quota, value]) @@ -82,9 +80,9 @@ class QuotaSizes(command.Lister): 'Size Name', 'Service', 'Resource', 'Value'] rows = [] - for size, size_details in six.iteritems(quota_data['quota_sizes']): - for service, service_details in six.iteritems(size_details): - for resource, value in six.iteritems(service_details): + for size, size_details in quota_data['quota_sizes'].items(): + for service, service_details in size_details.items(): + for resource, value in service_details.items(): rows.append([size, service, resource, value]) return headers, rows diff --git a/adjutantclient/v1/notifications.py b/adjutantclient/v1/notifications.py index 5aae611..ca6e5b1 100644 --- a/adjutantclient/v1/notifications.py +++ b/adjutantclient/v1/notifications.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib import parse +from urllib import parse from adjutantclient.common import base diff --git a/adjutantclient/v1/quota.py b/adjutantclient/v1/quota.py index b632882..fbe2b2d 100644 --- a/adjutantclient/v1/quota.py +++ b/adjutantclient/v1/quota.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib import parse +from urllib import parse from adjutantclient.common import base diff --git a/adjutantclient/v1/roles.py b/adjutantclient/v1/roles.py index e953caa..3a95887 100644 --- a/adjutantclient/v1/roles.py +++ b/adjutantclient/v1/roles.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib import parse +from urllib import parse from adjutantclient.common import base from adjutantclient import exc diff --git a/adjutantclient/v1/tasks.py b/adjutantclient/v1/tasks.py index 9180b5f..21ee49f 100644 --- a/adjutantclient/v1/tasks.py +++ b/adjutantclient/v1/tasks.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib import parse +from urllib import parse from adjutantclient.common import base diff --git a/adjutantclient/v1/tokens.py b/adjutantclient/v1/tokens.py index 58f92f7..6975648 100644 --- a/adjutantclient/v1/tokens.py +++ b/adjutantclient/v1/tokens.py @@ -14,7 +14,7 @@ from adjutantclient.common import base -from six.moves.urllib import parse +from urllib import parse class Token(base.Resource): diff --git a/adjutantclient/v1/users.py b/adjutantclient/v1/users.py index 835d67c..bedfb1a 100644 --- a/adjutantclient/v1/users.py +++ b/adjutantclient/v1/users.py @@ -13,7 +13,7 @@ # under the License. -from six.moves.urllib import parse +from moves.urllib import parse from adjutantclient.common import base diff --git a/requirements.txt b/requirements.txt index 5f00e9c..75e7f0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,3 @@ oslo.utils>=3.20.0 # Apache-2.0 keystoneauth1>=2.20.0 # Apache-2.0 PyYAML>=3.10.0 # MIT requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0 -six>=1.9.0 # MIT