From b54d9f122c898ad8f5f36d0be39391feb13fa194 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Tue, 23 Jun 2015 19:45:57 -0500 Subject: [PATCH] Stop using .keys() on dicts where not needed Iterating over a dict results in the keys. Using the 'in' operator on a dict checks if it's a key. Change-Id: I6affbfa1a79a9e8c0b5b304078a7a8e4e792eecd --- keystoneclient/auth/identity/v3/base.py | 2 +- keystoneclient/httpclient.py | 2 +- keystoneclient/session.py | 4 ++-- keystoneclient/tests/functional/test_cli.py | 4 ++-- keystoneclient/tests/unit/test_memcache_crypt.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keystoneclient/auth/identity/v3/base.py b/keystoneclient/auth/identity/v3/base.py index 784bd96d3..31cab8bc4 100644 --- a/keystoneclient/auth/identity/v3/base.py +++ b/keystoneclient/auth/identity/v3/base.py @@ -218,7 +218,7 @@ class AuthMethod(object): setattr(self, param, kwargs.pop(param, None)) if kwargs: - msg = _("Unexpected Attributes: %s") % ", ".join(kwargs.keys()) + msg = _("Unexpected Attributes: %s") % ", ".join(kwargs) raise AttributeError(msg) @classmethod diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index c66353597..85fd1eaae 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -579,7 +579,7 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin): Returns a slash-separated string of values ordered by key name. """ - return '/'.join([kwargs[k] or '?' for k in sorted(kwargs.keys())]) + return '/'.join([kwargs[k] or '?' for k in sorted(kwargs)]) def get_auth_ref_from_keyring(self, **kwargs): """Retrieve auth_ref from keyring. diff --git a/keystoneclient/session.py b/keystoneclient/session.py index cace4f799..88a53f374 100644 --- a/keystoneclient/session.py +++ b/keystoneclient/session.py @@ -130,7 +130,7 @@ class Session(object): if not session: session = requests.Session() # Use TCPKeepAliveAdapter to fix bug 1323862 - for scheme in session.adapters.keys(): + for scheme in session.adapters: session.mount(scheme, TCPKeepAliveAdapter()) self.auth = auth @@ -682,7 +682,7 @@ class Session(object): pass if params_copy: - raise exceptions.UnsupportedParameters(list(params_copy.keys())) + raise exceptions.UnsupportedParameters(list(params_copy)) return params diff --git a/keystoneclient/tests/functional/test_cli.py b/keystoneclient/tests/functional/test_cli.py index 8400e7ce0..e3800a269 100644 --- a/keystoneclient/tests/functional/test_cli.py +++ b/keystoneclient/tests/functional/test_cli.py @@ -59,8 +59,8 @@ class SimpleReadOnlyKeystoneClientTest(base.ClientTestBase): # check that region and publicURL exists. One might also # check for adminURL and internalURL. id seems to be optional # and is missing in the catalog backend - self.assertIn('publicURL', svc.keys()) - self.assertIn('region', svc.keys()) + self.assertIn('publicURL', svc) + self.assertIn('region', svc) def test_admin_endpoint_list(self): out = self.keystone('endpoint-list') diff --git a/keystoneclient/tests/unit/test_memcache_crypt.py b/keystoneclient/tests/unit/test_memcache_crypt.py index 254612105..29c8eb10f 100644 --- a/keystoneclient/tests/unit/test_memcache_crypt.py +++ b/keystoneclient/tests/unit/test_memcache_crypt.py @@ -54,7 +54,7 @@ class MemcacheCryptPositiveTests(testtools.TestCase): len(keys['MAC'])) self.assertNotEqual(keys['ENCRYPTION'], keys['MAC']) - self.assertIn('strategy', keys.keys()) + self.assertIn('strategy', keys) def test_key_strategy_diff(self): k1 = self._setup_keys(b'MAC')