Merge 122fe60 into 4726127

django-import-export · Aug 30, 2021 · 8859a69 · 8859a69
2 parents 4726127 + 122fe60
commit 8859a69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/import_export/formats/base_formats.py b/import_export/formats/base_formats.py
@@ -175,7 +175,9 @@ def create_dataset(self, in_stream):
         from io import BytesIO
 
         import openpyxl
-        xlsx_book = openpyxl.load_workbook(BytesIO(in_stream), read_only=True)
+
+        # 'data_only' means values are read from formula cells, not the formula itself
+        xlsx_book = openpyxl.load_workbook(BytesIO(in_stream), read_only=True, data_only=True)
 
         dataset = tablib.Dataset()
         sheet = xlsx_book.active

diff --git a/tests/core/tests/test_base_formats.py b/tests/core/tests/test_base_formats.py
@@ -1,4 +1,5 @@
 import os
+import unittest
 from unittest import mock
 
 import tablib
@@ -86,6 +87,11 @@ def test_import(self):
         with open(filename, self.format.get_read_mode()) as in_stream:
             self.format.create_dataset(in_stream.read())
 
+    @mock.patch("openpyxl.load_workbook")
+    def test_that_load_workbook_called_with_required_args(self, mock_load_workbook):
+        self.format.create_dataset(b"abc")
+        mock_load_workbook.assert_called_with(unittest.mock.ANY, read_only=True, data_only=True)
+
 
 class CSVTest(TestCase):