Support encoding memoryview to JSON

psycopg2 returns `buffer` objects in Python 2.7 and `memoryview` in Python 3. See #3156
getredash · Oct 10, 2019 · b4df990 · b4df990
1 parent c4d94e1
commit b4df990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/redash/utils/__init__.py b/redash/utils/__init__.py
@@ -21,10 +21,6 @@
 
 from .human_time import parse_human_time
 
-try:
-    buffer
-except NameError:
-    buffer = bytes
 
 COMMENTS_REGEX = re.compile("/\*.*?\*/")
 WRITER_ENCODING = os.environ.get('REDASH_CSV_WRITER_ENCODING', 'utf-8')
@@ -101,7 +97,7 @@ def default(self, o):
             result = o.isoformat()
             if o.microsecond:
                 result = result[:12]
-        elif isinstance(o, buffer):
+        elif isinstance(o, memoryview):
             result = binascii.hexlify(o)
         else:
             result = super(JSONEncoder, self).default(o)

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -4,10 +4,6 @@
 from redash.utils import (build_url, collect_parameters_from_request,
                           filter_none, json_dumps, generate_token)
 
-try:
-    buffer
-except NameError:
-    buffer = bytes
 
 DummyRequest = namedtuple('DummyRequest', ['host', 'scheme'])
 
@@ -49,7 +45,7 @@ def test_skips_nones(self):
 
 class TestJsonDumps(TestCase):
     def test_handles_binary(self):
-        self.assertEqual(json_dumps(buffer("test")), '"74657374"')
+        self.assertEqual(json_dumps(memoryview(b"test")), '"74657374"')
 
 
 class TestGenerateToken(TestCase):