maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Changed teardown error handling to be more reliable.

Browse source
This commit is contained in:
Armin Ronacher 2013-05-30 18:15:17 +01:00
parent 90e3906d02
commit f1918093ac
3 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
flask/ctx.py
View file

@ -352,6 +352,13 @@ class RequestContext(object):
if app_ctx is not None:
app_ctx.pop(exc)
def auto_pop(self, exc):
if self.request.environ.get('flask._preserve_context') or \
(exc is not None and self.app.preserve_context_on_exception):
self.preserved = True
else:
self.pop(exc)
def __enter__(self):
self.push()
return self
@ -362,11 +369,7 @@ class RequestContext(object):
# access the request object in the interactive shell. Furthermore
# the context can be force kept alive for the test client.
# See flask.testing for how this works.
if self.request.environ.get('flask._preserve_context') or \
(tb is not None and self.app.preserve_context_on_exception):
self.preserved = True
else:
self.pop(exc_value)
self.auto_pop(exc_value)
def __repr__(self):
return '<%s \'%s\' [%s] of %s>' % (