json_dumps: add support for serializing buffer objects. (#3156)

Author: arikfr

redash/utils/__init__.py

@@ -8,6 +8,7 @@
 import random
 import re
 import uuid
+import binascii
 
 import pystache
 import pytz
@@ -81,6 +82,8 @@ def default(self, o):
             return str(o)
         elif isinstance(o, (datetime.date, datetime.time)):
             return o.isoformat()
+        elif isinstance(o, buffer):
+            return binascii.hexlify(o)
         else:
             return super(JSONEncoder, self).default(o)
 

tests/test_utils.py

@@ -1,8 +1,10 @@
+import binascii
 from collections import namedtuple
 from unittest import TestCase
 
 from redash.utils import (build_url, collect_parameters_from_request,
-                          collect_query_parameters, filter_none)
+                          collect_query_parameters, filter_none,
+                          json_dumps)
 
 DummyRequest = namedtuple('DummyRequest', ['host', 'scheme'])
 
@@ -61,3 +63,8 @@ def test_skips_nones(self):
         }
 
         self.assertDictEqual(filter_none(d), {'a': 1})
+
+
+class TestJsonDumps(TestCase):
+    def test_handles_binary(self):
+        self.assertEqual(json_dumps(buffer("test")), '"74657374"')