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

@ -14,6 +14,7 @@ from __future__ import with_statement
import flask
import unittest
from flask.testsuite import FlaskTestCase
import six
class TestToolsTestCase(FlaskTestCase):
@ -85,7 +86,7 @@ class TestToolsTestCase(FlaskTestCase):
@app.route('/')
def index():
return unicode(flask.session['foo'])
return six.text_type(flask.session['foo'])
with app.test_client() as c:
with c.session_transaction() as sess: