pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle 'pd.Timestamp' when jsonifying (#4275)

This commit is contained in:
Maxime Beauchemin 2018-01-24 16:09:22 -08:00 committed by GitHub
parent b72d5b03dc
commit a0621e10a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
superset/utils.py
View File

@ -34,6 +34,7 @@ from flask_babel import gettext as __
from flask_cache import Cache
import markdown as md
import numpy
import pandas as pd
import parsedatetime
from past.builtins import basestring
from pydruid.utils.having import Having
@ -360,11 +361,7 @@ def json_iso_dttm_ser(obj, pessimistic=False):
val = base_json_conv(obj)
if val is not None:
return val
if isinstance(obj, datetime):
obj = obj.isoformat()
elif isinstance(obj, date):
obj = obj.isoformat()
elif isinstance(obj, time):
if isinstance(obj, (datetime, date, time, pd.Timestamp)):
obj = obj.isoformat()
else:
if pessimistic:
@ -398,7 +395,7 @@ def json_int_dttm_ser(obj):
val = base_json_conv(obj)
if val is not None:
return val
if isinstance(obj, datetime):
if isinstance(obj, (datetime, pd.Timestamp)):
obj = datetime_to_epoch(obj)
elif isinstance(obj, date):
obj = (obj - EPOCH.date()).total_seconds() * 1000