diff --git a/flask/app.py b/flask/app.py index 4e97605e..58ccbae4 100644 --- a/flask/app.py +++ b/flask/app.py @@ -289,7 +289,7 @@ class Flask(_PackageBoundObject): 'SESSION_COOKIE_SECURE': False, 'SESSION_REFRESH_EACH_REQUEST': True, 'MAX_CONTENT_LENGTH': None, - 'SEND_FILE_MAX_AGE_DEFAULT': 12 * 60 * 60, # 12 hours + 'SEND_FILE_MAX_AGE_DEFAULT': 12 * 60 * 60, # 12 hours 'TRAP_BAD_REQUEST_ERRORS': False, 'TRAP_HTTP_EXCEPTIONS': False, 'EXPLAIN_TEMPLATE_LOADING': False, diff --git a/flask/helpers.py b/flask/helpers.py index 9c85fa00..cd29095b 100644 --- a/flask/helpers.py +++ b/flask/helpers.py @@ -573,7 +573,7 @@ def safe_join(directory, filename): def wiki_page(filename): filename = safe_join(app.config['WIKI_FOLDER'], filename) with open(filename, 'rb') as fd: - content = fd.read() # Read and process the file content... + content = fd.read() # Read and process the file content... :param directory: the base directory. :param filename: the untrusted filename relative to that directory. diff --git a/tests/test_templating.py b/tests/test_templating.py index 5aaf9081..cda49d9b 100644 --- a/tests/test_templating.py +++ b/tests/test_templating.py @@ -287,8 +287,8 @@ def test_iterable_loader(): @app.route('/') def index(): return flask.render_template( - ['no_template.xml', # should skip this one - 'simple_template.html', # should render this + ['no_template.xml', # should skip this one + 'simple_template.html', # should render this 'context_template.html'], value=23)