diff options
| author | Chang Bo Guo <guochbo@cn.ibm.com> | 2013-11-28 02:38:03 -0800 |
|---|---|---|
| committer | Chang Bo Guo <guochbo@cn.ibm.com> | 2013-11-28 02:38:03 -0800 |
| commit | a2ff39f478438a095a042d1c8f496a3a2e02bcfc (patch) | |
| tree | f56ac1ee8ee7efa73a106f6f27c64f45201ba9d7 | |
| parent | c606de76c741ead69256758198ded7529ac019cf (diff) | |
| download | oslo-serialization-a2ff39f478438a095a042d1c8f496a3a2e02bcfc.tar.gz | |
Use six.iteritems to make dict work on Python2/3
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
| -rw-r--r-- | openstack/common/jsonutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
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] |