Created shared function for cell val / fmt

Author: WillAyd

Diff for: pandas/io/excel.py

@@ -775,35 +775,6 @@ def _pop_header_name(row, index_col):
         return none_fill(row[i]), row[:i] + [''] + row[i + 1:]
 
 
-def _conv_value(val):
-    """ Convert numpy types to Python types for the Excel writers.
-
-        Parameters
-        ----------
-        val : object
-            Value to be written into cells
-
-        Returns
-        -------
-        If val is a numpy int, float, or bool, then the equivalent Python
-        types are returned. :obj:`datetime`, :obj:`date`, and :obj:`timedelta`
-        are passed and formatting must be handled in the writer. :obj:`str`
-        representation is returned for all other types.
-    """
-    if is_integer(val):
-        val = int(val)
-    elif is_float(val):
-        val = float(val)
-    elif is_bool(val):
-        val = bool(val)
-    elif isinstance(val, (datetime, date, timedelta)):
-        pass
-    else:
-        val = compat.to_str(val)
-
-    return val
-
-
 @add_metaclass(abc.ABCMeta)
 class ExcelWriter(object):
     """
@@ -949,6 +920,39 @@ def _get_sheet_name(self, sheet_name):
                              'cur_sheet property')
         return sheet_name
 
+    def _value_with_fmt(self, val):
+        """Convert numpy types to Python types for the Excel writers.
+
+        Parameters
+        ----------
+        val : object
+            Value to be written into cells
+
+        Returns
+        -------
+        Tuple with the first element being the converted value and the second
+            being an optional format
+        """
+        fmt = None
+
+        if is_integer(val):
+            val = int(val)
+        elif is_float(val):
+            val = float(val)
+        elif is_bool(val):
+            val = bool(val)
+        elif isinstance(val, datetime):
+            fmt = self.datetime_format
+        elif isinstance(val, date):
+            fmt = self.date_format
+        elif isinstance(val, timedelta):
+            val = val.total_seconds() / float(86400)
+            fmt = '0'
+        else:
+            val = compat.to_str(val)
+
+        return val, fmt
+
     @classmethod
     def check_extension(cls, ext):
         """checks that path's extension against the Writer's supported
@@ -1378,13 +1382,9 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
                 row=startrow + cell.row + 1,
                 column=startcol + cell.col + 1
             )
-            xcell.value = _conv_value(cell.val)
-
-            if isinstance(cell.val, timedelta):
-                delta = cell.val
-                xcell.value = delta.total_seconds() / float(86400)
-                # Set format to prevent conversion to datetime
-                xcell.number_format = '0'
+            xcell.value, fmt = self._value_with_fmt(cell.val)
+            if fmt:
+                xcell.number_format = fmt
 
             style_kwargs = {}
             if cell.style:
@@ -1471,25 +1471,16 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
         style_dict = {}
 
         for cell in cells:
-            val = _conv_value(cell.val)
-
-            num_format_str = None
-            if isinstance(cell.val, datetime):
-                num_format_str = self.datetime_format
-            elif isinstance(cell.val, date):
-                num_format_str = self.date_format
-            elif isinstance(cell.val, timedelta):
-                delta = cell.val
-                val = delta.total_seconds() / float(86400)
+            val, fmt = self._value_with_fmt(cell.val)
 
             stylekey = json.dumps(cell.style)
-            if num_format_str:
-                stylekey += num_format_str
+            if fmt:
+                stylekey += fmt
 
             if stylekey in style_dict:
                 style = style_dict[stylekey]
             else:
-                style = self._convert_to_style(cell.style, num_format_str)
+                style = self._convert_to_style(cell.style, fmt)
                 style_dict[stylekey] = style
 
             if cell.mergestart is not None and cell.mergeend is not None:
@@ -1747,26 +1738,17 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
             wks.freeze_panes(*(freeze_panes))
 
         for cell in cells:
-            val = _conv_value(cell.val)
-
-            num_format_str = None
-            if isinstance(cell.val, datetime):
-                num_format_str = self.datetime_format
-            elif isinstance(cell.val, date):
-                num_format_str = self.date_format
-            elif isinstance(cell.val, timedelta):
-                delta = cell.val
-                val = delta.total_seconds() / float(86400)
+            val, fmt = self._value_with_fmt(cell.val)
 
             stylekey = json.dumps(cell.style)
-            if num_format_str:
-                stylekey += num_format_str
+            if fmt:
+                stylekey += fmt
 
             if stylekey in style_dict:
                 style = style_dict[stylekey]
             else:
                 style = self.book.add_format(
-                    _XlsxStyler.convert(cell.style, num_format_str))
+                    _XlsxStyler.convert(cell.style, fmt))
                 style_dict[stylekey] = style
 
             if cell.mergestart is not None and cell.mergeend is not None: