From bbee6d1aa13ecd99c72087a77fda1f14274d265f Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Mon, 17 Jul 2017 23:26:56 +0800 Subject: [PATCH] Revert "Explicitly raise ValueError in to_primitive" This reverts commit 3727b2d6e051b7b07680df361f38b9dbb576462c. It breaks nova's test, need log warning before we make major release. Change-Id: Ibbfde6207fc8c066155758c7c1aa1521b95d4db1 --- oslo_serialization/jsonutils.py | 2 +- oslo_serialization/tests/test_jsonutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oslo_serialization/jsonutils.py b/oslo_serialization/jsonutils.py index 4936fd5..9659563 100644 --- a/oslo_serialization/jsonutils.py +++ b/oslo_serialization/jsonutils.py @@ -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) - raise ValueError("Cannot convert %r to primitive" % (value,)) + return value JSONEncoder = json.JSONEncoder diff --git a/oslo_serialization/tests/test_jsonutils.py b/oslo_serialization/tests/test_jsonutils.py index cfbe673..9eb3c25 100644 --- a/oslo_serialization/tests/test_jsonutils.py +++ b/oslo_serialization/tests/test_jsonutils.py @@ -254,7 +254,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase): self.assertEqual(dict(b=1), jsonutils.to_primitive(x, convert_instances=True)) - self.assertRaises(ValueError, jsonutils.to_primitive, x) + self.assertEqual(x, jsonutils.to_primitive(x)) def test_typeerror(self): x = bytearray # Class, not instance