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

Merge branch 'master' of github.com:mitsuhiko/flask

Browse source
This commit is contained in:
Armin Ronacher 2011-07-13 14:04:42 +02:00
commit f8b9f4d41c
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/tutorial/dbcon.rst
View file

@ -9,7 +9,7 @@ connection in all our functions so it makes sense to initialize them
before each request and shut them down afterwards. before each request and shut them down afterwards.
Flask allows us to do that with the :meth:`~flask.Flask.before_request`, Flask allows us to do that with the :meth:`~flask.Flask.before_request`,
:meth:`~flask.Flask.teardown_request` and :meth:`~flask.Flask.teardown_request` :meth:`~flask.Flask.after_request` and :meth:`~flask.Flask.teardown_request`
decorators:: decorators::
@app.before_request @app.before_request

2
flask/app.py
View file

@ -112,7 +112,7 @@ class Flask(_PackageBoundObject):
#: configuration key. Defaults to `False`. #: configuration key. Defaults to `False`.
debug = ConfigAttribute('DEBUG') debug = ConfigAttribute('DEBUG')
#: The testing flask. Set this to `True` to enable the test mode of #: The testing flag. Set this to `True` to enable the test mode of
#: Flask extensions (and in the future probably also Flask itself). #: Flask extensions (and in the future probably also Flask itself).
#: For example this might activate unittest helpers that have an #: For example this might activate unittest helpers that have an
#: additional runtime cost which should not be enabled by default. #: additional runtime cost which should not be enabled by default.

1
flask/ctx.py
View file

@ -12,7 +12,6 @@
from werkzeug.exceptions import HTTPException from werkzeug.exceptions import HTTPException
from .globals import _request_ctx_stack from .globals import _request_ctx_stack
from .session import _NullSession
from .module import blueprint_is_module from .module import blueprint_is_module