Merge pull request #329 from alphagov/convert-excel-float-to-int

Attempt to convert excel floats to int

backdrop/core/upload/parse_excel.py

@@ -45,8 +45,11 @@ def _extract_cell_value(cell, book):
     if cell.ctype == xlrd.XL_CELL_DATE:
         time_tuple = xlrd.xldate_as_tuple(cell.value, book.datemode)
         return utc(datetime.datetime(*time_tuple)).isoformat()
-    if cell.ctype == xlrd.XL_CELL_EMPTY:
+    elif cell.ctype == xlrd.XL_CELL_EMPTY:
         return None
+    elif cell.ctype == xlrd.XL_CELL_NUMBER:
+        # Convert to int where possible to match CSV parsing
+        return int(cell.value) if cell.value % 1 == 0 else cell.value
     elif cell.ctype == xlrd.XL_CELL_ERROR:
         logging.warn("Encountered errors in cells when parsing excel file")
         return EXCEL_ERROR

tests/core/upload/test_parse_excel.py

@@ -1,9 +1,8 @@
 import unittest
-from hamcrest import assert_that, only_contains, contains
-from backdrop.core.errors import ParseError
+from hamcrest import assert_that, contains, instance_of
 
-from backdrop.core.upload.parse_excel import parse_excel, ExcelError, EXCEL_ERROR
-from tests.support.test_helpers import fixture_path, d_tz
+from backdrop.core.upload.parse_excel import parse_excel, EXCEL_ERROR
+from tests.support.test_helpers import fixture_path
 
 
 class ParseExcelTestCase(unittest.TestCase):
@@ -59,3 +58,8 @@ def test_parse_xlsx_handle_empty_cells_and_lines(self):
                 [None, None, None],
                 ["The above row", "is full", "of nones"]
             )))
+
+    def test_that_numbers_are_converted_to_int_where_possible(self):
+        data = map(list, self._parse_excel("xlsfile.xls"))
+
+        assert_that(data[0][1][2], instance_of(int))