Fixes incorrect date type inference in #6432. (#6433)

twosigma · Dec 4, 2017 · 29a69a5 · 29a69a5
1 parent e5a14a6
commit 29a69a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/beakerx/beakerx/tabledisplay/tabledisplay.py b/beakerx/beakerx/tabledisplay/tabledisplay.py
@@ -155,7 +155,7 @@ def convert_type(object_type, value):
                 return "integer"
         if object_type == "uint64":
             return "int64"
-        if is_date(value):
+        if object_type.startswith("datetime64"):
             return "time"
         if isinstance(value, str):
             return "string"

diff --git a/beakerx/beakerx/tabledisplay/tableitems.py b/beakerx/beakerx/tabledisplay/tableitems.py
@@ -43,15 +43,15 @@ class ColumnType(Enum):
 
 class DateType:
     type = "Date"
-    
+
     def __init__(self, value):
-        self.timestamp = parse(value).timestamp() * 1000
+        self.timestamp = parse(str(value)).timestamp() * 1000
 
 
 class DataBarsRenderer:
     type = "DataBars"
     includeText = True
-    
+
     def __init__(self, x):
         self.includeText = x
 
@@ -60,7 +60,7 @@ class DecimalStringFormat:
     type = "decimal"
     minDecimals = 4
     maxDecimals = 4
-    
+
     def __init__(self, min=4, max=4):
         self.minDecimals = min
         self.maxDecimals = max
@@ -96,8 +96,8 @@ class TableDisplayCellHighlighter:
     FULL_ROW = HighlightStyle.FULL_ROW
     SINGLE_COLUMN = HighlightStyle.SINGLE_COLUMN
     defaultStyle = HighlightStyle.FULL_ROW
-    
+
     @staticmethod
     def getHeatmapHighlighter(colName, style=defaultStyle, minVal=None, maxVal=None, minColor=None, maxColor=None):
         return HeatmapHighlighter (colName, style, minVal, maxVal, minColor, maxColor)
-        
+