diff --git a/karborclient/common/apiclient/auth.py b/karborclient/common/apiclient/auth.py index 8588fb6..f96263f 100644 --- a/karborclient/common/apiclient/auth.py +++ b/karborclient/common/apiclient/auth.py @@ -54,7 +54,7 @@ def load_auth_system_opts(parser): """ group = parser.add_argument_group("Common auth options") BaseAuthPlugin.add_common_opts(group) - for name, auth_plugin in six.iteritems(_discovered_plugins): + for name, auth_plugin in _discovered_plugins.items(): group = parser.add_argument_group( "Auth-system '%s' options" % name, conflict_handler="resolve") diff --git a/karborclient/common/apiclient/base.py b/karborclient/common/apiclient/base.py index 35df741..3674866 100644 --- a/karborclient/common/apiclient/base.py +++ b/karborclient/common/apiclient/base.py @@ -297,7 +297,7 @@ class CrudManager(BaseManager): def _filter_kwargs(self, kwargs): """Drop null values and handle ids.""" - for key, ref in six.iteritems(kwargs.copy()): + for key, ref in kwargs.copy().items(): if ref is None: kwargs.pop(key) else: @@ -470,7 +470,7 @@ class Resource(object): return None def _add_details(self, info): - for (k, v) in six.iteritems(info): + for (k, v) in info.items(): try: setattr(self, k, v) self._info[k] = v diff --git a/karborclient/common/apiclient/exceptions.py b/karborclient/common/apiclient/exceptions.py index 3be9338..0d7c0c5 100644 --- a/karborclient/common/apiclient/exceptions.py +++ b/karborclient/common/apiclient/exceptions.py @@ -22,7 +22,6 @@ Exception definitions. import inspect import sys -import six from karborclient.i18n import _ @@ -410,7 +409,7 @@ class HttpVersionNotSupported(HttpServerError): # _code_map contains all the classes that have http_status attribute. _code_map = dict( (getattr(obj, 'http_status', None), obj) - for name, obj in six.iteritems(vars(sys.modules[__name__])) + for name, obj in vars(sys.modules[__name__]).items() if inspect.isclass(obj) and getattr(obj, 'http_status', False) ) diff --git a/karborclient/common/utils.py b/karborclient/common/utils.py index 03686be..997a1f4 100644 --- a/karborclient/common/utils.py +++ b/karborclient/common/utils.py @@ -120,7 +120,7 @@ def print_dict(d, property="Property", dict_format_list=None, json_format_list=None): pt = prettytable.PrettyTable([property, 'Value'], caching=False) pt.align = 'l' - for r in six.iteritems(d): + for r in d.items(): r = list(r) if isinstance(r[1], six.string_types) and "\r" in r[1]: r[1] = r[1].replace("\r", " ")