Issue 3358 fix

[anirudhnarayanan]

fixes #3358

[davidism]

Needs tests and changelog as well

[anirudhnarayanan]

Will refactor code to avoid repetition, and will check the test cases

…

On Thu, Nov 7, 2019 at 2:10 PM David Lord ***@***.***> wrote: ***@***.**** requested changes on this pull request. Needs tests and changelog as well ------------------------------ In src/flask/helpers.py <#3419 (comment)>: > @@ -41,6 +41,10 @@ from .globals import session from .signals import message_flashed +if sys.version_info >= (3, 0): This is already handled in flask._compat ------------------------------ In src/flask/helpers.py <#3419 (comment)>: > @@ -630,6 +634,21 @@ def send_file( mtime = os.path.getmtime(filename) fsize = os.path.getsize(filename) headers["Content-Length"] = fsize + + elif isinstance(file,io.StringIO): + """ + Reaches String IO parsing to BytesIO + """ + mem = BytesIO() + mem.write(file.getvalue().encode('utf-8')) + mem.seek(0) + file = mem Just do file = BytesIO initially ------------------------------ In src/flask/helpers.py <#3419 (comment)>: > @@ -630,6 +634,21 @@ def send_file( mtime = os.path.getmtime(filename) fsize = os.path.getsize(filename) headers["Content-Length"] = fsize + + elif isinstance(file,io.StringIO): + """ + Reaches String IO parsing to BytesIO + """ + mem = BytesIO() + mem.write(file.getvalue().encode('utf-8')) + mem.seek(0) + file = mem + try: + fsize = file.getbuffer().nbytes Duplicates code below, if/elif/elif needs to be refactored to avoid that. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#3419?email_source=notifications&email_token=AD3TCQBSV7AFDZV6RUBXTUTQSRR2PA5CNFSM4JKL4YS2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKYKLVI#pullrequestreview-313566677>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AD3TCQHH4QPENWAEDB5VBDLQSRR2PANCNFSM4JKL4YSQ> .

[anirudhnarayanan]

Hi David, the reason I need to do the version check, is because in python2.7 stringio is imported from StringIO and not from io. I have fixed the repetition. In my new pull request I did fail one test, "stylecheck: commands failed" Could you please assist me on fixing it? Also are there any other changes I need to make/include? Best, Anirudh On Thu, Nov 7, 2019 at 2:11 PM Anirudh Narayanan <anirudh95@gmail.com> wrote:

…

Will refactor code to avoid repetition, and will check the test cases On Thu, Nov 7, 2019 at 2:10 PM David Lord ***@***.***> wrote: > ***@***.**** requested changes on this pull request. > > Needs tests and changelog as well > ------------------------------ > > In src/flask/helpers.py > <#3419 (comment)>: > > > @@ -41,6 +41,10 @@ > from .globals import session > from .signals import message_flashed > > +if sys.version_info >= (3, 0): > > This is already handled in flask._compat > ------------------------------ > > In src/flask/helpers.py > <#3419 (comment)>: > > > @@ -630,6 +634,21 @@ def send_file( > mtime = os.path.getmtime(filename) > fsize = os.path.getsize(filename) > headers["Content-Length"] = fsize > + > + elif isinstance(file,io.StringIO): > + """ > + Reaches String IO parsing to BytesIO > + """ > + mem = BytesIO() > + mem.write(file.getvalue().encode('utf-8')) > + mem.seek(0) > + file = mem > > Just do file = BytesIO initially > ------------------------------ > > In src/flask/helpers.py > <#3419 (comment)>: > > > @@ -630,6 +634,21 @@ def send_file( > mtime = os.path.getmtime(filename) > fsize = os.path.getsize(filename) > headers["Content-Length"] = fsize > + > + elif isinstance(file,io.StringIO): > + """ > + Reaches String IO parsing to BytesIO > + """ > + mem = BytesIO() > + mem.write(file.getvalue().encode('utf-8')) > + mem.seek(0) > + file = mem > + try: > + fsize = file.getbuffer().nbytes > > Duplicates code below, if/elif/elif needs to be refactored to avoid that. > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub > <#3419?email_source=notifications&email_token=AD3TCQBSV7AFDZV6RUBXTUTQSRR2PA5CNFSM4JKL4YS2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKYKLVI#pullrequestreview-313566677>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AD3TCQHH4QPENWAEDB5VBDLQSRR2PANCNFSM4JKL4YSQ> > . >

[davidism]

Thanks for working on this. After reviewing the issue, I've decided send_file is not meant to handle text, only bytes.