Merge pull request #1426 from pyexcel/master

use iget_array to reduce memory footprint. and removed useless import…
This commit is contained in:
Chris Hill-Scott
2017-08-22 12:22:42 +01:00
committed by GitHub
2 changed files with 10 additions and 10 deletions

View File

@@ -22,10 +22,6 @@ from flask import (
)
from flask_login import current_user
import pyexcel
import pyexcel_io
import pyexcel_xls
import pyexcel_xlsx
import pyexcel_ods3
from notifications_utils.template import (
SMSPreviewTemplate,
@@ -246,12 +242,16 @@ class Spreadsheet():
return cls(Spreadsheet.normalise_newlines(file_content), filename)
if extension == 'tsv':
file_content = StringIO(Spreadsheet.normalise_newlines(file_content))
file_content = StringIO(
Spreadsheet.normalise_newlines(file_content))
return cls.from_rows(pyexcel.get_sheet(
file_type=extension,
file_content=file_content.read()
).to_array(), filename)
instance = cls.from_rows(
pyexcel.iget_array(
file_type=extension,
file_stream=file_content),
filename)
pyexcel.free_resources()
return instance
def get_help_argument():

View File

@@ -13,7 +13,7 @@ pyexcel==0.5.3
pyexcel-io==0.4.4
pyexcel-xls==0.4.0
pyexcel-xlsx==0.4.1
pyexcel-ods3==0.4.0
pyexcel-ods3==0.4.1
pytz==2017.2
six==1.10.0
gunicorn==19.7.1