Merge "Python 3: use six.iteritems() instead of iteritems()"

glanceclient/v1/images.py

@@ -15,6 +15,7 @@
 
 import copy
 import json
+import six
 import urllib
 
 from glanceclient.common import base
@@ -58,7 +59,7 @@ class ImageManager(base.Manager):
     def _image_meta_from_headers(self, headers):
         meta = {'properties': {}}
         safe_decode = strutils.safe_decode
-        for key, value in headers.iteritems():
+        for key, value in six.iteritems(headers):
             value = safe_decode(value, incoming='utf-8')
             if key.startswith('x-image-meta-property-'):
                 _key = safe_decode(key[22:], incoming='utf-8')
@@ -86,9 +87,9 @@ class ImageManager(base.Manager):
                 return str(value)
             return value
 
-        for key, value in fields_copy.pop('properties', {}).iteritems():
+        for key, value in six.iteritems(fields_copy.pop('properties', {})):
             headers['x-image-meta-property-%s' % key] = to_str(value)
-        for key, value in fields_copy.iteritems():
+        for key, value in six.iteritems(fields_copy):
             headers['x-image-meta-%s' % key] = to_str(value)
         return headers
 
@@ -160,7 +161,7 @@ class ImageManager(base.Manager):
                     return not (image.owner == owner)
 
             owner = qp.pop('owner', None)
-            for param, value in qp.iteritems():
+            for param, value in six.iteritems(qp):
                 if isinstance(value, basestring):
                     # Note(flaper87) Url encoding should
                     # be moved inside http utils, at least

glanceclient/v1/shell.py

@@ -17,6 +17,7 @@ from __future__ import print_function
 
 import argparse
 import copy
+import six
 import sys
 
 from glanceclient.common import progressbar
@@ -113,7 +114,7 @@ def _image_show(image, human_readable=False, max_column_width=80):
     info = copy.deepcopy(image._info)
     if human_readable:
         info['size'] = utils.make_size_human_readable(info['size'])
-    for (k, v) in info.pop('properties').iteritems():
+    for (k, v) in six.iteritems(info.pop('properties')):
         info['Property \'%s\'' % k] = v
 
     utils.print_dict(info, max_column_width=max_column_width)