diff options
| -rw-r--r-- | openstack/common/jsonutils.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_jsonutils.py | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index 6130a7f..e8e14c4 100644 --- a/openstack/common/jsonutils.py +++ b/openstack/common/jsonutils.py @@ -107,7 +107,7 @@ 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) elif convert_instances and hasattr(value, '__dict__'): diff --git a/tests/unit/test_jsonutils.py b/tests/unit/test_jsonutils.py index fe25697..46b5b36 100644 --- a/tests/unit/test_jsonutils.py +++ b/tests/unit/test_jsonutils.py @@ -95,6 +95,24 @@ class ToPrimitiveTestCase(unittest.TestCase): 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() + 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): a = 10 |