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

Merge pull request #751 from ThomasWaldmann/sprint-branch

Browse source 
fixing issues found while debugging, fix error in 1 test
This commit is contained in:
Armin Ronacher 2013-05-30 07:08:17 -07:00
commit 7f35fc2935
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/app.py
View file

@ -1551,7 +1551,7 @@ class Flask(_PackageBoundObject):
# set the headers and status. We do this because there can be # set the headers and status. We do this because there can be
# some extra logic involved when creating these objects with # some extra logic involved when creating these objects with
# specific values (like default content type selection). # specific values (like default content type selection).
if isinstance(rv, string_types): if isinstance(rv, string_types + (bytes, )):
rv = self.response_class(rv, headers=headers, status=status) rv = self.response_class(rv, headers=headers, status=status)
headers = status = None headers = status = None
else: else:

3
flask/testsuite/appctx.py
View file

@ -87,8 +87,9 @@ class AppContextTestCase(FlaskTestCase):
with flask._app_ctx_stack.top: with flask._app_ctx_stack.top:
with flask._request_ctx_stack.top: with flask._request_ctx_stack.top:
pass pass
self.assert_true(flask._request_ctx_stack.request.environ self.assert_true(flask._request_ctx_stack.top.request.environ
['werkzeug.request'] is not None) ['werkzeug.request'] is not None)
return u''
c = app.test_client() c = app.test_client()
c.get('/') c.get('/')
self.assertEqual(called, ['request', 'app']) self.assertEqual(called, ['request', 'app'])