Merge changes I536e1ca0,Ifb878368,Ie1d71b85

* changes:
  Add missing convert_instances arg.
  Track to_primitive() depth after iteritems().
  Update iteritems test case to actually test iteritems.

1 files changed, 4 insertions, 2 deletions

diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py
index 6130a7f..f96e727 100644
--- a/openstack/common/jsonutils.py
+++ b/openstack/common/jsonutils.py
@@ -107,9 +107,11 @@ def to_primitive(value, convert_instances=False, level=0):
         elif hasattr(value, 'iteritems'):
             return to_primitive(dict(value.iteritems()),
                                 convert_instances=convert_instances,
-                                level=level)
+                                level=level + 1)
         elif hasattr(value, '__iter__'):
-            return to_primitive(list(value), level)
+            return to_primitive(list(value),
+                                convert_instances=convert_instances,
+                                level=level)
         elif convert_instances and hasattr(value, '__dict__'):
             # Likely an instance of something. Watch for cycles.
             # Ignore class member vars.