diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-29 14:06:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-29 14:06:04 +0000 |
| commit | abc54a00b01ea305a9c58a379463edf62d0557ca (patch) | |
| tree | 46fe813ea161933c5f1ce7914cbc625551d344c2 /neutronclient/common | |
| parent | 60b41109c6016bc4c7bf452a121226a0371e4b5f (diff) | |
| parent | dae498eedbf393ec4fd8eeecb07936b085540b64 (diff) | |
| download | python-neutronclient-2.3.6.tar.gz | |
Merge "Python 3: use six.iteritems()"2.3.6
Diffstat (limited to 'neutronclient/common')
| -rw-r--r-- | neutronclient/common/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/neutronclient/common/utils.py b/neutronclient/common/utils.py index 3fe025a..b26166d 100644 --- a/neutronclient/common/utils.py +++ b/neutronclient/common/utils.py @@ -23,6 +23,8 @@ import logging import os import sys +import six + from neutronclient.common import _ from neutronclient.common import exceptions from neutronclient.openstack.common import strutils @@ -48,7 +50,7 @@ def to_primitive(value): return o elif isinstance(value, dict): o = {} - for k, v in value.iteritems(): + for k, v in six.iteritems(value): o[k] = to_primitive(v) return o elif isinstance(value, datetime.datetime): |