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

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

Browse source
This commit is contained in:
Armin Ronacher 2012-10-07 12:49:03 +02:00
commit 62c0c67d88
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/app.py
View file

@ -1265,7 +1265,7 @@ class Flask(_PackageBoundObject):
def handle_exception(self, e): def handle_exception(self, e):
"""Default exception handling that kicks in when an exception """Default exception handling that kicks in when an exception
occours that is not caught. In debug mode the exception will occurs that is not caught. In debug mode the exception will
be re-raised immediately, otherwise it is logged and the handler be re-raised immediately, otherwise it is logged and the handler
for a 500 internal server error is used. If no such handler for a 500 internal server error is used. If no such handler
exists, a default 500 internal server error message is displayed. exists, a default 500 internal server error message is displayed.

4
flask/templating.py
View file

@ -129,8 +129,8 @@ def render_template_string(source, **context):
"""Renders a template from the given template source string """Renders a template from the given template source string
with the given context. with the given context.
:param template_name: the sourcecode of the template to be :param source: the sourcecode of the template to be
rendered rendered
:param context: the variables that should be available in the :param context: the variables that should be available in the
context of the template. context of the template.
""" """