From 9054b35e02ea64fb239d1d3df5b394b3d297c128 Mon Sep 17 00:00:00 2001 From: michelle_thomas Date: Tue, 14 Jan 2020 15:15:29 -0800 Subject: [PATCH] Revert "Ensure proper JSON serialization of numpy.ndarray (#8946)" This reverts commit 7ff18f060c32e7559976e6def3b3323e9ef9cf22. --- superset/utils/core.py | 8 +++----- tests/utils_tests.py | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/superset/utils/core.py b/superset/utils/core.py index ce55814b22a3..009981722c1c 100644 --- a/superset/utils/core.py +++ b/superset/utils/core.py @@ -40,7 +40,7 @@ import bleach import markdown as md -import numpy as np +import numpy import pandas as pd import parsedatetime import sqlalchemy as sa @@ -344,12 +344,10 @@ def format_timedelta(td: timedelta) -> str: def base_json_conv(obj): if isinstance(obj, memoryview): obj = obj.tobytes() - if isinstance(obj, np.int64): + if isinstance(obj, numpy.int64): return int(obj) - elif isinstance(obj, np.bool_): + elif isinstance(obj, numpy.bool_): return bool(obj) - elif isinstance(obj, np.ndarray): - return obj.tolist() elif isinstance(obj, set): return list(obj) elif isinstance(obj, decimal.Decimal): diff --git a/tests/utils_tests.py b/tests/utils_tests.py index 5bbfec1b328c..8b0c45af55de 100644 --- a/tests/utils_tests.py +++ b/tests/utils_tests.py @@ -121,7 +121,6 @@ def test_json_iso_dttm_ser(self): def test_base_json_conv(self): assert isinstance(base_json_conv(numpy.bool_(1)), bool) is True assert isinstance(base_json_conv(numpy.int64(1)), int) is True - assert isinstance(base_json_conv(numpy.array([1, 2, 3])), list) is True assert isinstance(base_json_conv(set([1])), list) is True assert isinstance(base_json_conv(Decimal("1.0")), float) is True assert isinstance(base_json_conv(uuid.uuid4()), str) is True