This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new a0621e1 Handle 'pd.Timestamp' when jsonifying (#4275)
a0621e1 is described below
commit a0621e10a826d79f93e5fe7530b7aef17b83f3a1
Author: Maxime Beauchemin <[email protected]>
AuthorDate: Wed Jan 24 16:09:22 2018 -0800
Handle 'pd.Timestamp' when jsonifying (#4275)
---
superset/utils.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/superset/utils.py b/superset/utils.py
index e28eda3..a5058b7 100644
--- a/superset/utils.py
+++ b/superset/utils.py
@@ -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
--
To stop receiving notification emails like this one, please contact
[email protected].
