From 2c2fdcbb390a5ca7a4ea86ab150e3f2269f615d5 Mon Sep 17 00:00:00 2001
From: Yassine Lamgarchal <yassine.lamgarchal@enovance.com>
Date: Thu, 9 Jan 2014 11:19:10 +0100
Subject: [PATCH] Python 3: use six.iteritems() instead of iteritems()

six.iteritems() replaces dictionary.iteritems() on Python 2 and
dictionary.items() on Python 3.

Change-Id: Ie5efa65c0a992e8136087a7b78ab8e8ce967326e
---
 glanceclient/v2/images.py | 3 ++-
 glanceclient/v2/shell.py  | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/glanceclient/v2/images.py b/glanceclient/v2/images.py
index 49a3bb46..480af5f9 100644
--- a/glanceclient/v2/images.py
+++ b/glanceclient/v2/images.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import six
 import urllib
 
 import warlock
@@ -59,7 +60,7 @@ class Controller(object):
             if isinstance(tag, basestring):
                 tags_url_params.append({'tag': strutils.safe_encode(tag)})
 
-        for param, value in filters.iteritems():
+        for param, value in six.iteritems(filters):
             if isinstance(value, basestring):
                 filters[param] = strutils.safe_encode(value)
 
diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py
index 5ee87a5c..8e4813d5 100644
--- a/glanceclient/v2/shell.py
+++ b/glanceclient/v2/shell.py
@@ -19,6 +19,7 @@ from glanceclient import exc
 import json
 import os
 from os.path import expanduser
+import six
 
 IMAGE_SCHEMA = None
 
@@ -54,7 +55,7 @@ def do_image_create(gc, args):
 
     image = gc.images.create(**fields)
     ignore = ['self', 'access', 'file', 'schema']
-    image = dict([item for item in image.iteritems()
+    image = dict([item for item in six.iteritems(image)
                   if item[0] not in ignore])
     utils.print_dict(image)
 
@@ -85,7 +86,7 @@ def do_image_update(gc, args):
     image_id = fields.pop('id')
     image = gc.images.update(image_id, remove_properties, **fields)
     ignore = ['self', 'access', 'file', 'schema']
-    image = dict([item for item in image.iteritems()
+    image = dict([item for item in six.iteritems(image)
                   if item[0] not in ignore])
     utils.print_dict(image)
 
@@ -124,7 +125,8 @@ def do_image_show(gc, args):
     """Describe a specific image."""
     image = gc.images.get(args.id)
     ignore = ['self', 'access', 'file', 'schema']
-    image = dict([item for item in image.iteritems() if item[0] not in ignore])
+    image = dict([item for item in six.iteritems(image) if item[0] not in
+                  ignore])
     utils.print_dict(image, max_column_width=int(args.max_column_width))