orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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/testsuite/basic.py
View file

@ -22,6 +22,7 @@ from flask.testsuite import FlaskTestCase, emits_module_deprecation_warning
from werkzeug.exceptions import BadRequest, NotFound
from werkzeug.http import parse_date
from werkzeug.routing import BuildError
import six
class BasicFunctionalityTestCase(FlaskTestCase):
@ -277,7 +278,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
@app.route('/test')
def test():
return unicode(flask.session.permanent)
return six.text_type(flask.session.permanent)
client = app.test_client()
rv = client.get('/')