diff options
author | M V P Nitesh <m.nitesh@nectechnologies.in> | 2017-04-03 18:20:15 +0530 |
---|---|---|
committer | M V P Nitesh <m.nitesh@nectechnologies.in> | 2017-04-03 18:20:52 +0530 |
commit | 46b9e429a2cbfcd1d898616c177538a9283997d3 (patch) | |
tree | d26fc8b13a0b0276c2ee7d9d7c6a7b154d6ac186 /keystoneclient/tests | |
parent | cfd33730868350cd475e45569a8c1573803a6895 (diff) | |
download | python-keystoneclient-46b9e429a2cbfcd1d898616c177538a9283997d3.tar.gz |
Replace six.iteritems() with .items()
1.As mentioned in [1], we should avoid using six.iteritems to achieve
iterators. We can use dict.items instead, as it will return iterators
in PY3 as well. And dict.items/keys will more readable.
2.In py2, the performance about list should be negligible, see the
link [2].
[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html
Change-Id: I18a6890935ebdbb589269379f21a0dd47d07eb3a
Diffstat (limited to 'keystoneclient/tests')
-rw-r--r-- | keystoneclient/tests/unit/apiclient/test_exceptions.py | 4 | ||||
-rw-r--r-- | keystoneclient/tests/unit/auth/test_identity_common.py | 2 | ||||
-rw-r--r-- | keystoneclient/tests/unit/auth/test_loading.py | 3 | ||||
-rw-r--r-- | keystoneclient/tests/unit/auth/utils.py | 3 | ||||
-rw-r--r-- | keystoneclient/tests/unit/client_fixtures.py | 2 | ||||
-rw-r--r-- | keystoneclient/tests/unit/test_discovery.py | 2 | ||||
-rw-r--r-- | keystoneclient/tests/unit/test_fixtures.py | 3 | ||||
-rw-r--r-- | keystoneclient/tests/unit/test_http.py | 4 | ||||
-rw-r--r-- | keystoneclient/tests/unit/test_session.py | 4 | ||||
-rw-r--r-- | keystoneclient/tests/unit/utils.py | 3 | ||||
-rw-r--r-- | keystoneclient/tests/unit/v2_0/test_client.py | 3 | ||||
-rw-r--r-- | keystoneclient/tests/unit/v3/test_client.py | 3 | ||||
-rw-r--r-- | keystoneclient/tests/unit/v3/utils.py | 3 |
13 files changed, 15 insertions, 24 deletions
diff --git a/keystoneclient/tests/unit/apiclient/test_exceptions.py b/keystoneclient/tests/unit/apiclient/test_exceptions.py index ddf8d98..65cf080 100644 --- a/keystoneclient/tests/unit/apiclient/test_exceptions.py +++ b/keystoneclient/tests/unit/apiclient/test_exceptions.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six - from keystoneclient import exceptions from keystoneclient.tests.unit import utils @@ -23,7 +21,7 @@ class FakeResponse(object): json_data = {} def __init__(self, **kwargs): - for key, value in six.iteritems(kwargs): + for key, value in kwargs.items(): setattr(self, key, value) def json(self): diff --git a/keystoneclient/tests/unit/auth/test_identity_common.py b/keystoneclient/tests/unit/auth/test_identity_common.py index 5793672..be8a062 100644 --- a/keystoneclient/tests/unit/auth/test_identity_common.py +++ b/keystoneclient/tests/unit/auth/test_identity_common.py @@ -461,7 +461,7 @@ class GenericAuthPluginTests(utils.TestCase): self.assertEqual(text, resp.text) - for k, v in six.iteritems(self.auth.headers): + for k, v in self.auth.headers.items(): self.assertRequestHeaderEqual(k, v) with self.deprecations.expect_deprecations_here(): diff --git a/keystoneclient/tests/unit/auth/test_loading.py b/keystoneclient/tests/unit/auth/test_loading.py index f8ef3b7..3c2689d 100644 --- a/keystoneclient/tests/unit/auth/test_loading.py +++ b/keystoneclient/tests/unit/auth/test_loading.py @@ -12,7 +12,6 @@ import uuid -import six from keystoneclient.tests.unit.auth import utils @@ -39,7 +38,7 @@ class TestOtherLoading(utils.TestCase): self.assertEqual(set(vals), set(called_opts)) - for k, v in six.iteritems(vals): + for k, v in vals.items(): # replace - to _ because it's the dest used to create kwargs self.assertEqual(v, p[k.replace('-', '_')]) diff --git a/keystoneclient/tests/unit/auth/utils.py b/keystoneclient/tests/unit/auth/utils.py index 6c8be8c..b693172 100644 --- a/keystoneclient/tests/unit/auth/utils.py +++ b/keystoneclient/tests/unit/auth/utils.py @@ -16,7 +16,6 @@ import uuid from keystoneauth1 import fixture import mock from oslo_config import cfg -import six from keystoneclient import access from keystoneclient.auth import base @@ -88,7 +87,7 @@ class TestCase(utils.TestCase): 'a_bool': a_bool} def assertTestVals(self, plugin, vals=TEST_VALS): - for k, v in six.iteritems(vals): + for k, v in vals.items(): self.assertEqual(v, plugin[k]) diff --git a/keystoneclient/tests/unit/client_fixtures.py b/keystoneclient/tests/unit/client_fixtures.py index 0e00545..6da259c 100644 --- a/keystoneclient/tests/unit/client_fixtures.py +++ b/keystoneclient/tests/unit/client_fixtures.py @@ -703,7 +703,7 @@ class Examples(fixtures.Fixture): self.TOKEN_RESPONSES[self.SIGNED_v3_TOKEN_SCOPED_KEY]) self.JSON_TOKEN_RESPONSES = dict([(k, jsonutils.dumps(v)) for k, v in - six.iteritems(self.TOKEN_RESPONSES)]) + self.TOKEN_RESPONSES.items()]) EXAMPLES_RESOURCE = testresources.FixtureResource(Examples()) diff --git a/keystoneclient/tests/unit/test_discovery.py b/keystoneclient/tests/unit/test_discovery.py index cc7fb0f..f9d5dbf 100644 --- a/keystoneclient/tests/unit/test_discovery.py +++ b/keystoneclient/tests/unit/test_discovery.py @@ -243,7 +243,7 @@ class AvailableVersionsTests(utils.TestCase): 'cinder': jsonutils.dumps(CINDER_EXAMPLES), 'glance': jsonutils.dumps(GLANCE_EXAMPLES)} - for path, text in six.iteritems(examples): + for path, text in examples.items(): url = "%s%s" % (BASE_URL, path) self.requests_mock.get(url, status_code=300, text=text) diff --git a/keystoneclient/tests/unit/test_fixtures.py b/keystoneclient/tests/unit/test_fixtures.py index 345ae45..d7fd26e 100644 --- a/keystoneclient/tests/unit/test_fixtures.py +++ b/keystoneclient/tests/unit/test_fixtures.py @@ -12,7 +12,6 @@ import uuid -import six from keystoneclient import fixture from keystoneclient.tests.unit import utils @@ -246,7 +245,7 @@ class V3TokenTests(utils.TestCase): # the endpoint content below easier. self.assertTrue(endpoint.pop('id')) - for interface, url in six.iteritems(endpoints): + for interface, url in endpoints.items(): endpoint = {'interface': interface, 'url': url, 'region': region, 'region_id': region} self.assertIn(endpoint, service['endpoints']) diff --git a/keystoneclient/tests/unit/test_http.py b/keystoneclient/tests/unit/test_http.py index 0282f1a..af9058f 100644 --- a/keystoneclient/tests/unit/test_http.py +++ b/keystoneclient/tests/unit/test_http.py @@ -202,10 +202,10 @@ class BasicRequestTests(utils.TestCase): self.request(headers=headers) - for k, v in six.iteritems(headers): + for k, v in headers.items(): self.assertRequestHeaderEqual(k, v) - for header in six.iteritems(headers): + for header in headers.items(): self.assertThat(self.logger_message.getvalue(), matchers.Contains('-H "%s: %s"' % header)) diff --git a/keystoneclient/tests/unit/test_session.py b/keystoneclient/tests/unit/test_session.py index 7a3c57d..27d224d 100644 --- a/keystoneclient/tests/unit/test_session.py +++ b/keystoneclient/tests/unit/test_session.py @@ -171,13 +171,13 @@ class SessionTests(utils.TestCase): self.assertIn(body, self.logger.output) self.assertIn("'%s'" % data, self.logger.output) - for k, v in six.iteritems(headers): + for k, v in headers.items(): self.assertIn(k, self.logger.output) self.assertIn(v, self.logger.output) # Assert that response headers contains actual values and # only debug logs has been masked - for k, v in six.iteritems(security_headers): + for k, v in security_headers.items(): self.assertIn('%s: {SHA1}' % k, self.logger.output) self.assertEqual(v, resp.headers[k]) self.assertNotIn(v, self.logger.output) diff --git a/keystoneclient/tests/unit/utils.py b/keystoneclient/tests/unit/utils.py index 378f912..6921b4b 100644 --- a/keystoneclient/tests/unit/utils.py +++ b/keystoneclient/tests/unit/utils.py @@ -19,7 +19,6 @@ from oslo_serialization import jsonutils import requests import requests_mock from requests_mock.contrib import fixture -import six from six.moves.urllib import parse as urlparse import testscenarios import testtools @@ -97,7 +96,7 @@ class TestCase(testtools.TestCase): parts = urlparse.urlparse(self.requests_mock.last_request.url) qs = urlparse.parse_qs(parts.query, keep_blank_values=True) - for k, v in six.iteritems(kwargs): + for k, v in kwargs.items(): self.assertIn(k, qs) self.assertIn(v, qs[k]) diff --git a/keystoneclient/tests/unit/v2_0/test_client.py b/keystoneclient/tests/unit/v2_0/test_client.py index fc9bf14..cddac4d 100644 --- a/keystoneclient/tests/unit/v2_0/test_client.py +++ b/keystoneclient/tests/unit/v2_0/test_client.py @@ -14,7 +14,6 @@ import json import uuid from keystoneauth1 import fixture -import six from keystoneauth1 import session as auth_session from keystoneclient.auth import token_endpoint @@ -207,7 +206,7 @@ class KeystoneClientTest(utils.TestCase): cl = client.Client(session=sess, **opts) - for k, v in six.iteritems(opts): + for k, v in opts.items(): self.assertEqual(v, getattr(cl._adapter, k)) self.assertEqual('identity', cl._adapter.service_type) diff --git a/keystoneclient/tests/unit/v3/test_client.py b/keystoneclient/tests/unit/v3/test_client.py index 29a2818..feb921a 100644 --- a/keystoneclient/tests/unit/v3/test_client.py +++ b/keystoneclient/tests/unit/v3/test_client.py @@ -14,7 +14,6 @@ import copy import json import uuid -import six from keystoneauth1 import session as auth_session from keystoneclient.auth import token_endpoint @@ -257,7 +256,7 @@ class KeystoneClientTest(utils.TestCase): cl = client.Client(session=sess, **opts) - for k, v in six.iteritems(opts): + for k, v in opts.items(): self.assertEqual(v, getattr(cl._adapter, k)) self.assertEqual('identity', cl._adapter.service_type) diff --git a/keystoneclient/tests/unit/v3/utils.py b/keystoneclient/tests/unit/v3/utils.py index 2c9c86d..d9cb5a4 100644 --- a/keystoneclient/tests/unit/v3/utils.py +++ b/keystoneclient/tests/unit/v3/utils.py @@ -12,7 +12,6 @@ import uuid -import six from six.moves.urllib import parse as urlparse from keystoneclient.tests.unit import client_fixtures @@ -301,7 +300,7 @@ class CrudTests(object): qs_args = self.requests_mock.last_request.qs qs_args_expected = expected_query or filter_kwargs - for key, value in six.iteritems(qs_args_expected): + for key, value in qs_args_expected.items(): self.assertIn(key, qs_args) # The querystring value is a list. Note we convert the value to a # string and lower, as the query string is always a string and the |