From e774e3a69eeb9a811a22e73ff87267e8bf4f9027 Mon Sep 17 00:00:00 2001 From: Armin Ronacher <armin.ronacher@active-4.com> Date: Mon, 18 Apr 2011 23:20:24 +0200 Subject: [PATCH] Switch params and example --- flask/helpers.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/flask/helpers.py b/flask/helpers.py index e04b7f28..418c4b17 100644 --- a/flask/helpers.py +++ b/flask/helpers.py @@ -391,11 +391,6 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False, def safe_join(directory, filename): """Safely join `directory` and `filename`. - :param directory: the base directory. - :param filename: the untrusted filename relative to that directory. - :raises: :class:`~werkzeug.exceptions.NotFound` if the retsulting path - would fall out of `directory`. - Example usage:: @app.route('/wiki/<path:filename>') @@ -404,6 +399,10 @@ def safe_join(directory, filename): with open(filename, 'rb') as fd: content = fd.read() # Read and process the file content... + :param directory: the base directory. + :param filename: the untrusted filename relative to that directory. + :raises: :class:`~werkzeug.exceptions.NotFound` if the retsulting path + would fall out of `directory`. """ filename = posixpath.normpath(filename) for sep in _os_alt_seps: