Skip to content

Commit

Permalink
Merge pull request pallets#1716 from lord63-forks/fix-typo
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
kennethreitz committed Feb 4, 2016
2 parents 22270d0 + 07fdd19 commit d5308bb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/reqcontext.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ find a piece of code that looks very much like this::
with self.request_context(environ):
try:
response = self.full_dispatch_request()
except Exception, e:
except Exception as e:
response = self.make_response(self.handle_exception(e))
return response(environ, start_response)

Expand Down
8 changes: 3 additions & 5 deletions flask/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,8 @@ def __init__(self, import_name, static_path=None, static_url_path=None,
#: A dictionary with lists of functions that should be called after
#: each request. The key of the dictionary is the name of the blueprint
#: this function is active for, ``None`` for all requests. This can for
#: example be used to open database connections or getting hold of the
#: currently logged in user. To register a function here, use the
#: :meth:`after_request` decorator.
#: example be used to close database connections. To register a function
#: here, use the :meth:`after_request` decorator.
self.after_request_funcs = {}

#: A dictionary with lists of functions that are called after
Expand Down Expand Up @@ -791,8 +790,7 @@ def run(self, host=None, port=None, debug=None, **options):
It is not recommended to use this function for development with
automatic reloading as this is badly supported. Instead you should
be using the :command:`flask` command line script's ``runserver``
support.
be using the :command:`flask` command line script's ``run`` support.
.. admonition:: Keep in Mind
Expand Down
2 changes: 1 addition & 1 deletion flask/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def get_namespace(self, namespace, lowercase=True, trim_namespace=True):
app.config['IMAGE_STORE_BASE_URL'] = 'http://img.website.com'
image_store_config = app.config.get_namespace('IMAGE_STORE_')
The resulting dictionary `image_store` would look like::
The resulting dictionary `image_store_config` would look like::
{
'type': 'fs',
Expand Down

0 comments on commit d5308bb

Please sign in to comment.