xlsx export: remove redundant code

Author: matthewhegarty

src/tablib/formats/_xlsx.py

@@ -158,16 +158,12 @@ def dset_sheet(cls, dataset, ws, freeze_panes=True, escape=False):
 
                 # wrap the rest
                 else:
-                    try:
-                        str_col_value = str(col)
-                    except TypeError:
-                        str_col_value = ''
-                    if '\n' in str_col_value:
+                    if '\n' in str(col):
                         cell.alignment = wrap_text
 
                 try:
                     cell.value = col
-                except (ValueError, TypeError):
+                except ValueError:
                     cell.value = str(col)
 
                 if escape and cell.data_type == 'f' and cell.value.startswith('='):

tests/test_tablib.py

@@ -1180,6 +1180,16 @@ def test_xlsx_bad_dimensions(self):
             data = tablib.Dataset().load(fh, read_only=False)
         self.assertEqual(data.height, 3)
 
+    def test_xlsx_raise_ValueError_on_cell_write_during_export(self):
+        """Test that the process handles errors which might be raised
+        when calling cell setter."""
+        # openpyxl does not handle array type, so will raise ValueError,
+        # which results in the array being cast to string
+        data.append(([1],))
+        _xlsx = data.export('xlsx')
+        wb = load_workbook(filename=BytesIO(_xlsx))
+        self.assertEqual('[1]', wb.active['A1'].value)
+
 
 class JSONTests(BaseTestCase):
     def test_json_format_detect(self):