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

Response data is bytes

Browse source
This commit is contained in:
Daniel Neuhäuser 2013-05-22 17:14:07 +02:00
parent 97815b999e
commit 5b89355b1c
6 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask/testsuite/basic.py
View file

@ -453,7 +453,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
return 'request' return 'request'
self.assert_('after' not in evts) self.assert_('after' not in evts)
rv = app.test_client().get('/').data rv = app.test_client().get('/').data
self.assert_('after' in evts) self.assert_(b'after' in evts)
self.assert_equal(rv, b'request|after') self.assert_equal(rv, b'request|after')
def test_after_request_processing(self): def test_after_request_processing(self):
@ -1096,7 +1096,7 @@ class SubdomainTestCase(FlaskTestCase):
app.register_module(mod) app.register_module(mod)
c = app.test_client() c = app.test_client()
rv = c.get('/static/hello.txt', 'http://foo.example.com/') rv = c.get('/static/hello.txt', 'http://foo.example.com/')
self.assert_equal(rv.data.strip(), 'Hello Subdomain') self.assert_equal(rv.data.strip(), b'Hello Subdomain')
def test_subdomain_matching(self): def test_subdomain_matching(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)

34
flask/testsuite/blueprints.py
View file

@ -157,7 +157,7 @@ class ModuleTestCase(FlaskTestCase):
self.assert_equal(rv.data, b'not found') self.assert_equal(rv.data, b'not found')
rv = c.get('/error') rv = c.get('/error')
self.assert_equal(rv.status_code, 500) self.assert_equal(rv.status_code, 500)
self.assert_equal('internal server error', rv.data) self.assert_equal(b'internal server error', rv.data)
def test_templates_and_static(self): def test_templates_and_static(self):
app = moduleapp app = moduleapp
@ -171,9 +171,9 @@ class ModuleTestCase(FlaskTestCase):
rv = c.get('/admin/index2') rv = c.get('/admin/index2')
self.assert_equal(rv.data, b'Hello from the Admin') self.assert_equal(rv.data, b'Hello from the Admin')
rv = c.get('/admin/static/test.txt') rv = c.get('/admin/static/test.txt')
self.assert_equal(rv.data.strip(), 'Admin File') self.assert_equal(rv.data.strip(), b'Admin File')
rv = c.get('/admin/static/css/test.css') rv = c.get('/admin/static/css/test.css')
self.assert_equal(rv.data.strip(), '/* nested file */') self.assert_equal(rv.data.strip(), b'/* nested file */')
with app.test_request_context(): with app.test_request_context():
self.assert_equal(flask.url_for('admin.static', filename='test.txt'), self.assert_equal(flask.url_for('admin.static', filename='test.txt'),
@ -310,10 +310,10 @@ class BlueprintTestCase(FlaskTestCase):
app.register_blueprint(bp, url_prefix='/2', url_defaults={'bar': 19}) app.register_blueprint(bp, url_prefix='/2', url_defaults={'bar': 19})
c = app.test_client() c = app.test_client()
self.assert_equal(c.get('/1/foo').data, u'23/42') self.assert_equal(c.get('/1/foo').data, b'23/42')
self.assert_equal(c.get('/2/foo').data, u'19/42') self.assert_equal(c.get('/2/foo').data, b'19/42')
self.assert_equal(c.get('/1/bar').data, u'23') self.assert_equal(c.get('/1/bar').data, b'23')
self.assert_equal(c.get('/2/bar').data, u'19') self.assert_equal(c.get('/2/bar').data, b'19')
def test_blueprint_url_processors(self): def test_blueprint_url_processors(self):
bp = flask.Blueprint('frontend', __name__, url_prefix='/<lang_code>') bp = flask.Blueprint('frontend', __name__, url_prefix='/<lang_code>')
@ -353,9 +353,9 @@ class BlueprintTestCase(FlaskTestCase):
rv = c.get('/admin/index2') rv = c.get('/admin/index2')
self.assert_equal(rv.data, b'Hello from the Admin') self.assert_equal(rv.data, b'Hello from the Admin')
rv = c.get('/admin/static/test.txt') rv = c.get('/admin/static/test.txt')
self.assert_equal(rv.data.strip(), 'Admin File') self.assert_equal(rv.data.strip(), b'Admin File')
rv = c.get('/admin/static/css/test.css') rv = c.get('/admin/static/css/test.css')
self.assert_equal(rv.data.strip(), '/* nested file */') self.assert_equal(rv.data.strip(), b'/* nested file */')
# try/finally, in case other tests use this app for Blueprint tests. # try/finally, in case other tests use this app for Blueprint tests.
max_age_default = app.config['SEND_FILE_MAX_AGE_DEFAULT'] max_age_default = app.config['SEND_FILE_MAX_AGE_DEFAULT']
@ -435,9 +435,9 @@ class BlueprintTestCase(FlaskTestCase):
app.register_blueprint(backend) app.register_blueprint(backend)
c = app.test_client() c = app.test_client()
self.assert_equal(c.get('/fe').data.strip(), '/be') self.assert_equal(c.get('/fe').data.strip(), b'/be')
self.assert_equal(c.get('/fe2').data.strip(), '/fe') self.assert_equal(c.get('/fe2').data.strip(), b'/fe')
self.assert_equal(c.get('/be').data.strip(), '/fe') self.assert_equal(c.get('/be').data.strip(), b'/fe')
def test_empty_url_defaults(self): def test_empty_url_defaults(self):
bp = flask.Blueprint('bp', __name__) bp = flask.Blueprint('bp', __name__)
@ -704,7 +704,7 @@ class BlueprintTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_template_test_after_route_with_template(self): def test_template_test_after_route_with_template(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -717,7 +717,7 @@ class BlueprintTestCase(FlaskTestCase):
return isinstance(value, bool) return isinstance(value, bool)
app.register_blueprint(bp, url_prefix='/py') app.register_blueprint(bp, url_prefix='/py')
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_add_template_test_with_template(self): def test_add_template_test_with_template(self):
bp = flask.Blueprint('bp', __name__) bp = flask.Blueprint('bp', __name__)
@ -730,7 +730,7 @@ class BlueprintTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_template_test_with_name_and_template(self): def test_template_test_with_name_and_template(self):
bp = flask.Blueprint('bp', __name__) bp = flask.Blueprint('bp', __name__)
@ -743,7 +743,7 @@ class BlueprintTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_add_template_test_with_name_and_template(self): def test_add_template_test_with_name_and_template(self):
bp = flask.Blueprint('bp', __name__) bp = flask.Blueprint('bp', __name__)
@ -756,7 +756,7 @@ class BlueprintTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def suite(): def suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()

2
flask/testsuite/helpers.py
View file

@ -357,7 +357,7 @@ class LoggingTestCase(FlaskTestCase):
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 500) self.assert_equal(rv.status_code, 500)
self.assert_('Internal Server Error' in rv.data) self.assert_(b'Internal Server Error' in rv.data)
err = out.getvalue() err = out.getvalue()
self.assert_('Exception on / [GET]' in err) self.assert_('Exception on / [GET]' in err)

2
flask/testsuite/subclassing.py
View file

@ -34,7 +34,7 @@ class FlaskSubclassingTestCase(FlaskTestCase):
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 500) self.assert_equal(rv.status_code, 500)
self.assert_('Internal Server Error' in rv.data) self.assert_(b'Internal Server Error' in rv.data)
err = out.getvalue() err = out.getvalue()
self.assert_equal(err, '') self.assert_equal(err, '')

22
flask/testsuite/templating.py
View file

@ -61,7 +61,7 @@ class TemplatingTestCase(FlaskTestCase):
{{ session.test }} {{ session.test }}
''') ''')
rv = app.test_client().get('/?foo=42') rv = app.test_client().get('/?foo=42')
self.assert_equal(rv.data.split(), ['42', '23', 'False', 'aha']) self.assert_equal(rv.data.split(), [b'42', b'23', b'False', b'aha'])
def test_escaping(self): def test_escaping(self):
text = '<p>Hello World!' text = '<p>Hello World!'
@ -72,12 +72,12 @@ class TemplatingTestCase(FlaskTestCase):
html=flask.Markup(text)) html=flask.Markup(text))
lines = app.test_client().get('/').data.splitlines() lines = app.test_client().get('/').data.splitlines()
self.assert_equal(lines, [ self.assert_equal(lines, [
'&lt;p&gt;Hello World!', b'&lt;p&gt;Hello World!',
'<p>Hello World!', b'<p>Hello World!',
'<p>Hello World!', b'<p>Hello World!',
'<p>Hello World!', b'<p>Hello World!',
'&lt;p&gt;Hello World!', b'&lt;p&gt;Hello World!',
'<p>Hello World!' b'<p>Hello World!'
]) ])
def test_no_escaping(self): def test_no_escaping(self):
@ -219,7 +219,7 @@ class TemplatingTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_add_template_test_with_template(self): def test_add_template_test_with_template(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -230,7 +230,7 @@ class TemplatingTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_template_test_with_name_and_template(self): def test_template_test_with_name_and_template(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -241,7 +241,7 @@ class TemplatingTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_add_template_test_with_name_and_template(self): def test_add_template_test_with_name_and_template(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -252,7 +252,7 @@ class TemplatingTestCase(FlaskTestCase):
def index(): def index():
return flask.render_template('template_test.html', value=False) return flask.render_template('template_test.html', value=False)
rv = app.test_client().get('/') rv = app.test_client().get('/')
self.assert_('Success!' in rv.data) self.assert_(b'Success!' in rv.data)
def test_add_template_global(self): def test_add_template_global(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)

14
flask/testsuite/testing.py
View file

@ -62,20 +62,20 @@ class TestToolsTestCase(FlaskTestCase):
with app.test_client() as c: with app.test_client() as c:
rv = c.get('/getsession') rv = c.get('/getsession')
assert rv.data == '<missing>' assert rv.data == b'<missing>'
rv = c.get('/') rv = c.get('/')
assert rv.data == 'index' assert rv.data == b'index'
assert flask.session.get('data') == 'foo' assert flask.session.get('data') == 'foo'
rv = c.post('/', data={}, follow_redirects=True) rv = c.post('/', data={}, follow_redirects=True)
assert rv.data == 'foo' assert rv.data == b'foo'
# This support requires a new Werkzeug version # This support requires a new Werkzeug version
if not hasattr(c, 'redirect_client'): if not hasattr(c, 'redirect_client'):
assert flask.session.get('data') == 'foo' assert flask.session.get('data') == 'foo'
rv = c.get('/getsession') rv = c.get('/getsession')
assert rv.data == 'foo' assert rv.data == b'foo'
def test_session_transactions(self): def test_session_transactions(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)
@ -153,7 +153,7 @@ class TestToolsTestCase(FlaskTestCase):
resp = c.get('/other') resp = c.get('/other')
self.assert_(not hasattr(flask.g, 'value')) self.assert_(not hasattr(flask.g, 'value'))
self.assert_('Internal Server Error' in resp.data) self.assert_(b'Internal Server Error' in resp.data)
self.assert_equal(resp.status_code, 500) self.assert_equal(resp.status_code, 500)
flask.g.value = 23 flask.g.value = 23
@ -220,7 +220,7 @@ class SubdomainTestCase(FlaskTestCase):
response = self.client.get(url) response = self.client.get(url)
self.assertEquals(200, response.status_code) self.assertEquals(200, response.status_code)
self.assertEquals('xxx', response.data) self.assertEquals(b'xxx', response.data)
def test_nosubdomain(self): def test_nosubdomain(self):
@ -232,7 +232,7 @@ class SubdomainTestCase(FlaskTestCase):
response = self.client.get(url) response = self.client.get(url)
self.assertEquals(200, response.status_code) self.assertEquals(200, response.status_code)
self.assertEquals('xxx', response.data) self.assertEquals(b'xxx', response.data)
def suite(): def suite():