From a2ff39f478438a095a042d1c8f496a3a2e02bcfc Mon Sep 17 00:00:00 2001 From: Chang Bo Guo Date: Thu, 28 Nov 2013 02:38:03 -0800 Subject: Use six.iteritems to make dict work on Python2/3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit six.iteritems returns an iterator over dictionary‘s items. This replaces dictionary.iteritems() on Python 2 and dictionary.items() on Python 3. See http://pythonhosted.org/six/#six.iteritems Implements: blueprint make-python3-compatible Change-Id: I90be87979ebc7eccd11d66cd1eef16d9b2eb9fda --- openstack/common/jsonutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index 39afa5e..cd4479a 100644 --- a/openstack/common/jsonutils.py +++ b/openstack/common/jsonutils.py @@ -122,7 +122,7 @@ def to_primitive(value, convert_instances=False, convert_datetime=True, level=level, max_depth=max_depth) if isinstance(value, dict): - return dict((k, recursive(v)) for k, v in value.iteritems()) + return dict((k, recursive(v)) for k, v in six.iteritems(value)) elif isinstance(value, (list, tuple)): return [recursive(lv) for lv in value] -- cgit v1.2.1