forked from orbit-oss/flask
python-modernize automated changes: fix_next
This commit is contained in:
parent
0f8c47c988
commit
dcd052366b
3 changed files with 5 additions and 3 deletions
|
|
@ -26,6 +26,7 @@ from functools import update_wrapper
|
||||||
|
|
||||||
from werkzeug.datastructures import Headers
|
from werkzeug.datastructures import Headers
|
||||||
from werkzeug.exceptions import NotFound
|
from werkzeug.exceptions import NotFound
|
||||||
|
import six
|
||||||
|
|
||||||
# this was moved in 0.7
|
# this was moved in 0.7
|
||||||
try:
|
try:
|
||||||
|
|
@ -128,7 +129,7 @@ def stream_with_context(generator_or_function):
|
||||||
# pushed. This item is discarded. Then when the iteration continues the
|
# pushed. This item is discarded. Then when the iteration continues the
|
||||||
# real generator is executed.
|
# real generator is executed.
|
||||||
wrapped_g = generator()
|
wrapped_g = generator()
|
||||||
wrapped_g.next()
|
six.advance_iterator(wrapped_g)
|
||||||
return wrapped_g
|
return wrapped_g
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ class TaggedJSONSerializer(object):
|
||||||
def object_hook(obj):
|
def object_hook(obj):
|
||||||
if len(obj) != 1:
|
if len(obj) != 1:
|
||||||
return obj
|
return obj
|
||||||
the_key, the_value = obj.iteritems().next()
|
the_key, the_value = six.advance_iterator(obj.iteritems())
|
||||||
if the_key == ' t':
|
if the_key == ' t':
|
||||||
return tuple(the_value)
|
return tuple(the_value)
|
||||||
elif the_key == ' u':
|
elif the_key == ' u':
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ from logging import StreamHandler
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
from flask.testsuite import FlaskTestCase, catch_warnings, catch_stderr
|
from flask.testsuite import FlaskTestCase, catch_warnings, catch_stderr
|
||||||
from werkzeug.http import parse_cache_control_header, parse_options_header
|
from werkzeug.http import parse_cache_control_header, parse_options_header
|
||||||
|
import six
|
||||||
|
|
||||||
|
|
||||||
def has_encoding(name):
|
def has_encoding(name):
|
||||||
|
|
@ -507,7 +508,7 @@ class StreamingTestCase(FlaskTestCase):
|
||||||
def close(self):
|
def close(self):
|
||||||
called.append(42)
|
called.append(42)
|
||||||
def next(self):
|
def next(self):
|
||||||
return self._gen.next()
|
return six.advance_iterator(self._gen)
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
def index():
|
def index():
|
||||||
def generate():
|
def generate():
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue