openstack
/
oslo.serialization
Code Issues Proposed changes

Merge "Explicitly raise ValueError in to_primitive"

This commit is contained in:
Jenkins 2017-07-05 11:26:43 +00:00 committed by Gerrit Code Review
parent 0515601245 3727b2d6e0
commit 2a29a5e836
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_serialization/jsonutils.py
View File

@ -167,7 +167,7 @@ def to_primitive(value, convert_instances=False, convert_datetime=True,
# __iter__ defined but it isn't callable as list().
return six.text_type(value)
return value
raise ValueError("Cannot convert %r to primitive" % (value,))
JSONEncoder = json.JSONEncoder

2
oslo_serialization/tests/test_jsonutils.py
View File

@ -254,7 +254,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
self.assertEqual(dict(b=1),
jsonutils.to_primitive(x, convert_instances=True))
self.assertEqual(x, jsonutils.to_primitive(x))
self.assertRaises(ValueError, jsonutils.to_primitive, x)
def test_typeerror(self):
x = bytearray # Class, not instance