fixed nan for writing pandas in UDFs closes #446

xlwings · Apr 21, 2016 · 6c3c443 · 6c3c443
1 parent 4c44441
commit 6c3c443
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/xlwings/_xlwindows.py b/xlwings/_xlwindows.py
@@ -408,6 +408,8 @@ def prepare_xl_data_element(x):
         return float(x)
     elif x is None:
         return ""
+    elif np and isinstance(x, float) and np.isnan(x):
+        return ""
     else:
         return x
 

diff --git a/xlwings/conversion/standard.py b/xlwings/conversion/standard.py
@@ -87,9 +87,7 @@ class CleanDataForWriteStage(object):
     def __call__(self, c):
         c.value = [
             [
-                None
-                if np and isinstance(x, float) and np.isnan(x)
-                else xlplatform.prepare_xl_data_element(x)
+                xlplatform.prepare_xl_data_element(x)
                 for x in y
             ]
             for y in c.value

diff --git a/xlwings/tests/udfs/udf_tests.py b/xlwings/tests/udfs/udf_tests.py
@@ -329,6 +329,10 @@ def read_timeseries(x):
     def write_timeseries():
         return pd.Series([1.5, 2.5], name='ts', index=[datetime(2000, 12, 20), datetime(2000, 12, 21)])
 
+    @xw.func
+    def write_series_nan():
+        return pd.Series([1, np.nan, 3])
+
 # Pandas DataFrame
 
 if pd:

diff --git a/xlwings/tests/udfs/udf_tests.xlsm b/xlwings/tests/udfs/udf_tests.xlsm