openstack/python-glanceclient
Code Issues Proposed changes

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

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

Change-Id: Ie5efa65c0a992e8136087a7b78ab8e8ce967326e
This commit is contained in:
Yassine Lamgarchal
2014-01-09 11:19:10 +01:00
parent 336feeb523
commit 2c2fdcbb39
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glanceclient/v2/images.py
View File

@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
import urllib import urllib
import warlock import warlock
@@ -59,7 +60,7 @@ class Controller(object):
if isinstance(tag, basestring): if isinstance(tag, basestring):
tags_url_params.append({'tag': strutils.safe_encode(tag)}) 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): if isinstance(value, basestring):
filters[param] = strutils.safe_encode(value) filters[param] = strutils.safe_encode(value)

8
glanceclient/v2/shell.py
View File

@@ -19,6 +19,7 @@ from glanceclient import exc
import json import json
import os import os
from os.path import expanduser from os.path import expanduser
import six
IMAGE_SCHEMA = None IMAGE_SCHEMA = None
@@ -54,7 +55,7 @@ def do_image_create(gc, args):
image = gc.images.create(**fields) image = gc.images.create(**fields)
ignore = ['self', 'access', 'file', 'schema'] 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]) if item[0] not in ignore])
utils.print_dict(image) utils.print_dict(image)
@@ -85,7 +86,7 @@ def do_image_update(gc, args):
image_id = fields.pop('id') image_id = fields.pop('id')
image = gc.images.update(image_id, remove_properties, **fields) image = gc.images.update(image_id, remove_properties, **fields)
ignore = ['self', 'access', 'file', 'schema'] 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]) if item[0] not in ignore])
utils.print_dict(image) utils.print_dict(image)
@@ -124,7 +125,8 @@ def do_image_show(gc, args):
"""Describe a specific image.""" """Describe a specific image."""
image = gc.images.get(args.id) image = gc.images.get(args.id)
ignore = ['self', 'access', 'file', 'schema'] 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)) utils.print_dict(image, max_column_width=int(args.max_column_width))