Skip to content

Commit 4712e44

Browse files
committed
improve coverage
1 parent ac258ad commit 4712e44

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

django_excel/__init__.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ def load_book(self):
1818

1919

2020
class ExcelFile(webio.ExcelInput, TemporaryUploadedFile):
21+
def _get_file_extension(self):
22+
extension = self.name.split(".")[1]
23+
return extension
24+
2125
def load_single_sheet(self, sheet_name=None, **keywords):
22-
return pe.load(self.file.replace(".upload", ""), sheet_name, **keywords)
26+
return pe.load_from_memory(self._get_file_extension(), self.file.read(), sheet_name, **keywords)
2327

2428
def load_book(self):
25-
return pe.load_book(self.file.replace(".upload", ""))
29+
return pe.load_book_from_memory(self._get_file_extension(), self.file.read())
2630

2731

2832
class ExcelMemoryFileUploadHandler(MemoryFileUploadHandler):
@@ -41,17 +45,12 @@ def file_complete(self, file_size):
4145
)
4246

4347
class TemporaryExcelFileUploadHandler(TemporaryFileUploadHandler):
44-
def file_complete(self, file_size):
45-
self.file.seek(0)
46-
return ExcelMemoryFile(
47-
file=self.file,
48-
field_name=self.field_name,
49-
name=self.file_name,
50-
content_type=self.content_type,
51-
size=file_size,
52-
charset=self.charset,
53-
content_type_extra=self.content_type_extra
54-
)
48+
def new_file(self, file_name, *args, **kwargs):
49+
"""
50+
Create the file object to append to as data is coming in.
51+
"""
52+
super(TemporaryFileUploadHandler, self).new_file(file_name, *args, **kwargs)
53+
self.file = ExcelFile(self.file_name, self.content_type, 0, self.charset, self.content_type_extra)
5554

5655
webio.ExcelResponse = HttpResponse
5756

0 commit comments

Comments
 (0)