diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-13 16:45:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-13 16:45:01 +0000 |
| commit | 0d0969a66b5e003798cfb737a22a7936803166fe (patch) | |
| tree | 3022ba199e3ec1eae5f8c2b3b991e1c88bfe5a92 /keystoneclient/discover.py | |
| parent | daa99ed5fe1df548c26feff68b45bda7ac94ea25 (diff) | |
| parent | 46b9e429a2cbfcd1d898616c177538a9283997d3 (diff) | |
| download | python-keystoneclient-0d0969a66b5e003798cfb737a22a7936803166fe.tar.gz | |
Merge "Replace six.iteritems() with .items()"
Diffstat (limited to 'keystoneclient/discover.py')
| -rw-r--r-- | keystoneclient/discover.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py index a70b409..823c94c 100644 --- a/keystoneclient/discover.py +++ b/keystoneclient/discover.py @@ -15,7 +15,6 @@ import warnings from debtcollector import removals from keystoneauth1 import plugin from positional import positional -import six from keystoneclient import _discover from keystoneclient import exceptions @@ -296,7 +295,7 @@ class Discover(_discover.Discover): raise exceptions.DiscoveryFailure(msg) # kwargs should take priority over stored kwargs. - for k, v in six.iteritems(self._client_kwargs): + for k, v in self._client_kwargs.items(): kwargs.setdefault(k, v) # restore the url to either auth_url or endpoint depending on what |