From e5477a099a96f5125d145712496cf8c0ed764b3c Mon Sep 17 00:00:00 2001 From: kylepollina Date: Thu, 27 Feb 2020 16:22:03 -0600 Subject: [PATCH 1/6] Fix typo in docs (#3517) --- docs/reqcontext.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reqcontext.rst b/docs/reqcontext.rst index 719d9b61..811e5950 100644 --- a/docs/reqcontext.rst +++ b/docs/reqcontext.rst @@ -109,7 +109,7 @@ redirects or chain different applications together. After the request is dispatched and a response is generated and sent, the request context is popped, which then pops the application context. Immediately before they are popped, the :meth:`~Flask.teardown_request` -and :meth:`~Flask.teardown_appcontext` functions are are executed. These +and :meth:`~Flask.teardown_appcontext` functions are executed. These execute even if an unhandled exception occurred during dispatch. From 1952236085b379c45a75d9ccbece5370ea98a0ab Mon Sep 17 00:00:00 2001 From: ongopongo <53710895+ongopongo@users.noreply.github.com> Date: Fri, 28 Feb 2020 12:09:51 -0800 Subject: [PATCH 2/6] Fix property name in description Previously, the description referred to a property named `original_error`. However, both the code sample that followed it _and_ the Werkzeug documentation refer to it as `original_exception` instead. In this commit, I change the description to use the same property name as is used in the code sample and the Werkzeug documentation. Here's a link to the Werkzeug documentation of that property: - https://werkzeug.palletsprojects.com/en/1.0.x/exceptions/#werkzeug.exceptions.InternalServerError.original_exception --- docs/errorhandling.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/errorhandling.rst b/docs/errorhandling.rst index 2f4b7335..b565aa3e 100644 --- a/docs/errorhandling.rst +++ b/docs/errorhandling.rst @@ -210,7 +210,7 @@ behavior. If there is an error handler registered for ``InternalServerError``, this will be invoked. As of Flask 1.1.0, this error handler will always be passed an instance of ``InternalServerError``, not the original -unhandled error. The original error is available as ``e.original_error``. +unhandled error. The original error is available as ``e.original_exception``. Until Werkzeug 1.0.0, this attribute will only exist during unhandled errors, use ``getattr`` to get access it for compatibility. From 1859a5fd2c3d9555119d2bff5de636e630350e27 Mon Sep 17 00:00:00 2001 From: gutianci Date: Thu, 5 Mar 2020 18:31:21 +0800 Subject: [PATCH 3/6] docs: testing.rst function def missing colon --- docs/testing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/testing.rst b/docs/testing.rst index 01eef000..bd6b1933 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -420,7 +420,7 @@ command line. :: @app.cli.command('hello') @click.option('--name', default='World') - def hello_command(name) + def hello_command(name): click.echo(f'Hello, {name}!') def test_hello(): @@ -447,7 +447,7 @@ This is useful for testing complex validation rules and custom types. :: @app.cli.command('hello') @click.option('--name', default='World', callback=upper) - def hello_command(name) + def hello_command(name): click.echo(f'Hello, {name}!') def test_hello_params(): From 4a5f5fc0a2918250f27854538c006e0698952d55 Mon Sep 17 00:00:00 2001 From: Tobias Sette Date: Mon, 16 Mar 2020 19:18:53 -0300 Subject: [PATCH 4/6] docs: update "Deploying on Google App Engine" Use the documentation for Python 3 instead of Python 2, which is deprecated. --- docs/deploying/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deploying/index.rst b/docs/deploying/index.rst index 5e98f98c..01584d36 100644 --- a/docs/deploying/index.rst +++ b/docs/deploying/index.rst @@ -17,7 +17,7 @@ Hosted options -------------- - `Deploying Flask on Heroku `_ -- `Deploying Flask on Google App Engine `_ +- `Deploying Flask on Google App Engine `_ - `Deploying Flask on AWS Elastic Beanstalk `_ - `Deploying on Azure (IIS) `_ - `Deploying on PythonAnywhere `_ From 88a07f1b75ec798c7d4e2eb0c534e38b08519b4d Mon Sep 17 00:00:00 2001 From: mattc41190 Date: Tue, 24 Mar 2020 09:54:32 -0500 Subject: [PATCH 5/6] itty bitty typo --- docs/templating.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templating.rst b/docs/templating.rst index 3fa7a066..2bb120ab 100644 --- a/docs/templating.rst +++ b/docs/templating.rst @@ -3,7 +3,7 @@ Templates ========= -Flask leverages Jinja2 as template engine. You are obviously free to use +Flask leverages Jinja2 as its template engine. You are obviously free to use a different template engine, but you still have to install Jinja2 to run Flask itself. This requirement is necessary to enable rich extensions. An extension can depend on Jinja2 being present. From 275216f607e8530be57fc38547de86bd3e7f2170 Mon Sep 17 00:00:00 2001 From: mattc41190 Date: Wed, 25 Mar 2020 09:20:55 -0500 Subject: [PATCH 6/6] Grammar and clarity fix --- docs/templating.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templating.rst b/docs/templating.rst index 2bb120ab..c10d8960 100644 --- a/docs/templating.rst +++ b/docs/templating.rst @@ -100,7 +100,7 @@ by default: Standard Filters ---------------- -These filters are available in Jinja2 additionally to the filters provided +Flask provides the following Jinja2 filters in addition to the filters provided by Jinja2 itself: .. function:: tojson