Merge "JSONDictSerializer encode objects to unicode"

2 files changed, 12 insertions, 1 deletions

diff --git a/openstack/common/wsgi.py b/openstack/common/wsgi.py
index f52fca0..1d6d9df 100644
--- a/openstack/common/wsgi.py
+++ b/openstack/common/wsgi.py
@@ -387,7 +387,7 @@ class JSONDictSerializer(DictSerializer):
             if isinstance(obj, datetime.datetime):
                 _dtime = obj - datetime.timedelta(microseconds=obj.microsecond)
                 return _dtime.isoformat()
-            return obj
+            return unicode(obj)
         return jsonutils.dumps(data, default=sanitizer)
 
 
diff --git a/tests/unit/test_wsgi.py b/tests/unit/test_wsgi.py
index 07c85d5..c621a8c 100644
--- a/tests/unit/test_wsgi.py
+++ b/tests/unit/test_wsgi.py
@@ -179,6 +179,17 @@ class JSONDictSerializerTest(unittest.TestCase):
         result = result.replace('\n', '').replace(' ', '')
         self.assertEqual(result, expected_json)
 
+    def test_object_unicode(self):
+        class TestUnicode:
+            def __unicode__(self):
+                return u'TestUnicode'
+        input_dict = dict(cls=TestUnicode())
+        expected_str = '{"cls":"TestUnicode"}'
+        serializer = wsgi.JSONDictSerializer()
+        result = serializer.serialize(input_dict)
+        result = result.replace('\n', '').replace(' ', '')
+        self.assertEqual(result, expected_str)
+
 
 class TextDeserializerTest(unittest.TestCase):