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

Merge remote-tracking branch 'origin/1.1.x'

Browse source
This commit is contained in:
David Lord 2020-04-02 11:56:30 -07:00
commit 037ae3f024
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/deploying/index.rst
View file

@ -17,7 +17,7 @@ Hosted options
-------------- --------------
- `Deploying Flask on Heroku <https://devcenter.heroku.com/articles/getting-started-with-python>`_ - `Deploying Flask on Heroku <https://devcenter.heroku.com/articles/getting-started-with-python>`_
- `Deploying Flask on Google App Engine <https://cloud.google.com/appengine/docs/standard/python/getting-started/python-standard-env>`_ - `Deploying Flask on Google App Engine <https://cloud.google.com/appengine/docs/standard/python3/runtime>`_
- `Deploying Flask on AWS Elastic Beanstalk <https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create-deploy-python-flask.html>`_ - `Deploying Flask on AWS Elastic Beanstalk <https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create-deploy-python-flask.html>`_
- `Deploying on Azure (IIS) <https://docs.microsoft.com/en-us/azure/app-service/containers/how-to-configure-python>`_ - `Deploying on Azure (IIS) <https://docs.microsoft.com/en-us/azure/app-service/containers/how-to-configure-python>`_
- `Deploying on PythonAnywhere <https://help.pythonanywhere.com/pages/Flask/>`_ - `Deploying on PythonAnywhere <https://help.pythonanywhere.com/pages/Flask/>`_

2
docs/errorhandling.rst
View file

@ -210,7 +210,7 @@ behavior.
If there is an error handler registered for ``InternalServerError``, If there is an error handler registered for ``InternalServerError``,
this will be invoked. As of Flask 1.1.0, this error handler will always this will be invoked. As of Flask 1.1.0, this error handler will always
be passed an instance of ``InternalServerError``, not the original 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 Until Werkzeug 1.0.0, this attribute will only exist during unhandled
errors, use ``getattr`` to get access it for compatibility. errors, use ``getattr`` to get access it for compatibility.

4
docs/templating.rst
View file

@ -3,7 +3,7 @@
Templates 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 a different template engine, but you still have to install Jinja2 to run
Flask itself. This requirement is necessary to enable rich extensions. Flask itself. This requirement is necessary to enable rich extensions.
An extension can depend on Jinja2 being present. An extension can depend on Jinja2 being present.
@ -100,7 +100,7 @@ by default:
Standard Filters 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: by Jinja2 itself:
.. function:: tojson .. function:: tojson

4
docs/testing.rst
View file

@ -423,7 +423,7 @@ command line. ::
@app.cli.command('hello') @app.cli.command('hello')
@click.option('--name', default='World') @click.option('--name', default='World')
def hello_command(name) def hello_command(name):
click.echo(f'Hello, {name}!') click.echo(f'Hello, {name}!')
def test_hello(): def test_hello():
@ -450,7 +450,7 @@ This is useful for testing complex validation rules and custom types. ::
@app.cli.command('hello') @app.cli.command('hello')
@click.option('--name', default='World', callback=upper) @click.option('--name', default='World', callback=upper)
def hello_command(name) def hello_command(name):
click.echo(f'Hello, {name}!') click.echo(f'Hello, {name}!')
def test_hello_params(): def test_hello_params():