diff --git a/docs/reqcontext.rst b/docs/reqcontext.rst index d7d74fbf8d..51cd66f6da 100644 --- a/docs/reqcontext.rst +++ b/docs/reqcontext.rst @@ -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) diff --git a/flask/app.py b/flask/app.py index f75dd818d7..02d470ed2e 100644 --- a/flask/app.py +++ b/flask/app.py @@ -421,7 +421,7 @@ 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 + #: example be used to close database connections or getting hold of the #: currently logged in user. To register a function here, use the #: :meth:`after_request` decorator. self.after_request_funcs = {} diff --git a/flask/config.py b/flask/config.py index d2eeb8378a..6f643a99b4 100644 --- a/flask/config.py +++ b/flask/config.py @@ -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',