Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Revert "Ensure proper JSON serialization of numpy.ndarray (apache#8946)"
Browse files Browse the repository at this point in the history
This reverts commit 7ff18f0.
  • Loading branch information
michelle_thomas committed Jan 14, 2020
1 parent f2312a3 commit 9054b35
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
8 changes: 3 additions & 5 deletions superset/utils/core.py
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down
1 change: 0 additions & 1 deletion tests/utils_tests.py
Expand Up @@ -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
Expand Down

0 comments on commit 9054b35

Please sign in to comment.