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

Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six

Browse source 
Conflicts:
	flask/testsuite/__init__.py
This commit is contained in:
Daniel Neuhäuser 2013-05-18 18:54:45 +02:00
commit 8494574fdf
13 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flask/helpers.py
View file

@ -26,6 +26,7 @@ from functools import update_wrapper
from werkzeug.datastructures import Headers
from werkzeug.exceptions import NotFound
import six
# this was moved in 0.7
try:
@ -128,7 +129,7 @@ def stream_with_context(generator_or_function):
# pushed. This item is discarded. Then when the iteration continues the
# real generator is executed.
wrapped_g = generator()
wrapped_g.next()
six.advance_iterator(wrapped_g)
return wrapped_g