Fix Python 3 issues

* Replace it.next() with next(it)
* Replace dict.iteritems() with six.iteritems(dict)
* Replace unicode with six.text_type
* Replace dict(d1.items() + {'Cookie': cookie}.items()) with:
  d3=dict(d1); d3['Cookie'] = cookie
* Replace map(func, parts) with [func(part) for part in parts]
* Open file in binary mode (not in text mode) to load JSON using
  jsonutils.load()
* Avoid using dict.keys()[0] or dict.values()[0]: on Python 3, keys()
  and values() methods of dictionaries return iterators, not lists

For more information on Python 3, see:
https://wiki.openstack.org/wiki/Python3

Change-Id: Ib09a3367d8dcb664911a0b187da9e363a96727fd

1 files changed, 2 insertions, 1 deletions

diff --git a/glance_store/tests/base.py b/glance_store/tests/base.py
index 4df57ad..6deba08 100644
--- a/glance_store/tests/base.py
+++ b/glance_store/tests/base.py
@@ -20,6 +20,7 @@ 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
@@ -66,7 +67,7 @@ class StoreBaseTest(base.BaseTestCase):
         test by the fixtures cleanup process.
         """
         group = kw.pop('group', 'glance_store')
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             self.conf.set_override(k, v, group)
 
     def register_store_schemes(self, store, store_entry):