From 17b767859d796a17bb609841da9da0e6ae39eb58 Mon Sep 17 00:00:00 2001 From: Timothy Heys Date: Tue, 23 Aug 2016 14:56:15 +0200 Subject: [PATCH] Fixed the format data functions to only check if a value is nan if it is a float --- fireant/slicer/transformers/datatables.py | 4 ++-- fireant/slicer/transformers/highcharts.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fireant/slicer/transformers/datatables.py b/fireant/slicer/transformers/datatables.py index e47f2aaa..301e1c92 100644 --- a/fireant/slicer/transformers/datatables.py +++ b/fireant/slicer/transformers/datatables.py @@ -19,7 +19,7 @@ def _format_data_point(value): else: return value.strftime('%Y-%m-%dT%H:%M:%S') - if value is None or np.isnan(value): + if value is None or (isinstance(value, float) and np.isnan(value)): return None if isinstance(value, np.int64): @@ -304,7 +304,7 @@ def _format_column_labels(self, csv_df, metrics, dimensions): dimension_label = dimensions[dimension_level]['label_options'].get(dimension_value, dimension_value) else: dimension_label = dimension_value - + dimension_label = _format_data_point(dimension_label) if dimension_label is not None: diff --git a/fireant/slicer/transformers/highcharts.py b/fireant/slicer/transformers/highcharts.py index 544fc55c..9b70f102 100644 --- a/fireant/slicer/transformers/highcharts.py +++ b/fireant/slicer/transformers/highcharts.py @@ -10,7 +10,7 @@ def _format_data_point(value): return value if isinstance(value, pd.Timestamp): return int(value.asm8) // int(1e6) - if np.isnan(value): + if value is None or (isinstance(value, float) and np.isnan(value)): return None if isinstance(value, np.int64): # Cannot serialize np.int64 to json