maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Fixed stream_with_context if decorated function has parameters

Browse source
This commit is contained in:
Shipeng Feng 2016-04-02 07:17:45 +08:00 • committed by David Lord
parent 9a80fe691d
commit cc536c8a7b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/helpers.py
View file

@ -101,7 +101,7 @@ def stream_with_context(generator_or_function):
gen = iter(generator_or_function) gen = iter(generator_or_function)
except TypeError: except TypeError:
def decorator(*args, **kwargs): def decorator(*args, **kwargs):
gen = generator_or_function() gen = generator_or_function(*args, **kwargs)
return stream_with_context(gen) return stream_with_context(gen)
return update_wrapper(decorator, generator_or_function) return update_wrapper(decorator, generator_or_function)

6
tests/test_helpers.py
View file

@ -683,11 +683,11 @@ class TestStreaming(object):
@app.route('/') @app.route('/')
def index(): def index():
@flask.stream_with_context @flask.stream_with_context
def generate(): def generate(hello):
yield 'Hello ' yield hello
yield flask.request.args['name'] yield flask.request.args['name']
yield '!' yield '!'
return flask.Response(generate()) return flask.Response(generate('Hello '))
c = app.test_client() c = app.test_client()
rv = c.get('/?name=World') rv = c.get('/?name=World')
assert rv.data == b'Hello World!' assert rv.data == b'Hello World!'