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.

2 files changed, 25 insertions, 12 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.
diff --git a/tests/unit/test_jsonutils.py b/tests/unit/test_jsonutils.py
index 4a18b77..46b5b36 100644
--- a/tests/unit/test_jsonutils.py
+++ b/tests/unit/test_jsonutils.py
@@ -88,19 +88,30 @@ class ToPrimitiveTestCase(unittest.TestCase):
                 self.data = dict(a=1, b=2, c=3).items()
                 self.index = 0
 
-            def __iter__(self):
-                return self
+            def iteritems(self):
+                return self.data
 
-            def next(self):
-                if self.index == len(self.data):
-                    raise StopIteration
-                self.index = self.index + 1
-                return self.data[self.index - 1]
+        x = IterItemsClass()
+        p = jsonutils.to_primitive(x)
+        self.assertEquals(p, {'a': 1, 'b': 2, 'c': 3})
+
+    def test_iteritems_with_cycle(self):
+        class IterItemsClass(object):
+            def __init__(self):
+                self.data = dict(a=1, b=2, c=3)
+                self.index = 0
+
+            def iteritems(self):
+                return self.data.items()
 
         x = IterItemsClass()
-        ordered = jsonutils.to_primitive(x)
-        ordered.sort()
-        self.assertEquals(ordered, [['a', 1], ['b', 2], ['c', 3]])
+        x2 = IterItemsClass()
+        x.data['other'] = x2
+        x2.data['other'] = x
+
+        # If the cycle isn't caught, to_primitive() will eventually result in
+        # an exception due to excessive recursion depth.
+        p = jsonutils.to_primitive(x)
 
     def test_instance(self):
         class MysteryClass(object):