diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-28 14:49:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-28 14:49:38 +0000 |
| commit | 05453b19b26ca86459fff477e84e1b041e98a520 (patch) | |
| tree | 18b0c49f0984906be820680aa96e6593e65e04c5 /glanceclient/tests/unit | |
| parent | 66a297929112830a4a18eba210a2f4a77570fcae (diff) | |
| parent | 5fca39dbde82d4cf836fa666b549b606f7ccdb7f (diff) | |
| download | python-glanceclient-05453b19b26ca86459fff477e84e1b041e98a520.tar.gz | |
Merge "Replace six.iteritems() with .items()"
Diffstat (limited to 'glanceclient/tests/unit')
| -rw-r--r-- | glanceclient/tests/unit/test_http.py | 4 | ||||
| -rw-r--r-- | glanceclient/tests/unit/v2/test_metadefs_objects.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/glanceclient/tests/unit/test_http.py b/glanceclient/tests/unit/test_http.py index c57d5d4..cec94e0 100644 --- a/glanceclient/tests/unit/test_http.py +++ b/glanceclient/tests/unit/test_http.py @@ -138,7 +138,7 @@ class TestClient(testtools.TestCase): http_client.get(path) headers = self.mock.last_request.headers - for k, v in six.iteritems(identity_headers): + for k, v in identity_headers.items(): self.assertEqual(v, headers[k]) def test_language_header_passed(self): @@ -377,7 +377,7 @@ class TestClient(testtools.TestCase): 'LOG.debug called with no arguments') needles = {'key': key, 'cert': cert, 'cacert': cacert} - for option, value in six.iteritems(needles): + for option, value in needles.items(): if value: regex = ".*\s--%s\s+('%s'|%s).*" % (option, value, value) self.assertThat(mock_log.call_args[0][0], diff --git a/glanceclient/tests/unit/v2/test_metadefs_objects.py b/glanceclient/tests/unit/v2/test_metadefs_objects.py index 509f755..5de3112 100644 --- a/glanceclient/tests/unit/v2/test_metadefs_objects.py +++ b/glanceclient/tests/unit/v2/test_metadefs_objects.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six import testtools from glanceclient.tests.unit.v2 import base @@ -276,7 +275,7 @@ class TestObjectController(testtools.TestCase): obj = self.controller.get(NAMESPACE1, OBJECT1) self.assertEqual(OBJECT1, obj.name) self.assertEqual(sorted([PROPERTY1, PROPERTY2]), - sorted(list(six.iterkeys(obj.properties)))) + sorted(list(obj.properties.keys()))) def test_create_object(self): properties = { |