summaryrefslogtreecommitdiff
path: root/tablib
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2016-01-27 17:16:22 -0500
committerKenneth Reitz <me@kennethreitz.org>2016-01-27 17:16:22 -0500
commit90ee799576995ed4c43561faf4041add6bf111be (patch)
treebf4b7f22985a79b4caf76fa2a7ad613f058094c6 /tablib
parentc02a21ccd2cbe66920beb5dbaa49a8cd7ddac8d9 (diff)
parent1fcb98f9aee0d580bab42f233ee11d34891cb17b (diff)
downloadtablib-90ee799576995ed4c43561faf4041add6bf111be.tar.gz
Merge pull request #208 from stclair/develop
Fix XLSX import
Diffstat (limited to 'tablib')
-rw-r--r--tablib/formats/_xlsx.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tablib/formats/_xlsx.py b/tablib/formats/_xlsx.py
index 57058c8..34e83e6 100644
--- a/tablib/formats/_xlsx.py
+++ b/tablib/formats/_xlsx.py
@@ -69,7 +69,7 @@ def import_set(dset, in_stream, headers=True):
dset.wipe()
- xls_book = openpyxl.reader.excel.load_workbook(in_stream)
+ xls_book = openpyxl.reader.excel.load_workbook(BytesIO(in_stream))
sheet = xls_book.get_active_sheet()
dset.title = sheet.title
@@ -87,7 +87,7 @@ def import_book(dbook, in_stream, headers=True):
dbook.wipe()
- xls_book = openpyxl.reader.excel.load_workbook(in_stream)
+ xls_book = openpyxl.reader.excel.load_workbook(BytesIO(in_stream))
for sheet in xls_book.worksheets:
data = tablib.Dataset()