Merge "Replace six.iteritems() with .items()"

glance_store/_drivers/rbd.py

@@ -25,7 +25,6 @@ import math
 
 from oslo_config import cfg
 from oslo_utils import units
-import six
 from six.moves import urllib
 
 from glance_store import capabilities
@@ -162,7 +161,7 @@ class StoreLocation(location.StoreLocation):
 
     def process_specs(self):
         # convert to ascii since librbd doesn't handle unicode
-        for key, value in six.iteritems(self.specs):
+        for key, value in self.specs.items():
             self.specs[key] = str(value)
         self.fsid = self.specs.get('fsid')
         self.pool = self.specs.get('pool')

glance_store/_drivers/vmware_datastore.py

@@ -500,7 +500,7 @@ class Store(glance_store.Store):
 
     def select_datastore(self, image_size):
         """Select a datastore with free space larger than image size."""
-        for k, v in sorted(six.iteritems(self.datastores), reverse=True):
+        for k, v in sorted(self.datastores.items(), reverse=True):
             max_ds = None
             max_fs = 0
             for ds in v:

glance_store/tests/base.py

@@ -20,7 +20,6 @@ import shutil
 import fixtures
 from oslo_config import cfg
 from oslotest import base
-import six
 
 import glance_store as store
 from glance_store import location
@@ -67,7 +66,7 @@ class StoreBaseTest(base.BaseTestCase):
         test by the fixtures cleanup process.
         """
         group = kw.pop('group', 'glance_store')
-        for k, v in six.iteritems(kw):
+        for k, v in kw.items():
             self.conf.set_override(k, v, group)
 
     def register_store_schemes(self, store, store_entry):

glance_store/tests/unit/test_cinder_store.py

@@ -37,7 +37,7 @@ from glance_store.tests.unit import test_store_capabilities
 
 class FakeObject(object):
     def __init__(self, **kwargs):
-        for name, value in six.iteritems(kwargs):
+        for name, value in kwargs.items():
             setattr(self, name, value)
 
 

glance_store/tests/unit/test_swift_store.py

@@ -91,7 +91,7 @@ def stub_out_swiftclient(stubs, swift_store_auth_version):
         fixture_containers.append(container)
 
     def fake_post_container(url, token, container, headers, **kwargs):
-        for key, value in six.iteritems(headers):
+        for key, value in headers.items():
             fixture_container_headers[key] = value
 
     def fake_put_object(url, token, container, name, contents, **kwargs):
@@ -152,7 +152,7 @@ def stub_out_swiftclient(stubs, swift_store_auth_version):
         byte_range = None
         headers = kwargs.get('headers', dict())
         if headers is not None:
-            headers = dict((k.lower(), v) for k, v in six.iteritems(headers))
+            headers = dict((k.lower(), v) for k, v in headers.items())
             if 'range' in headers:
                 byte_range = headers.get('range')