diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2014-02-06 00:31:14 -0500 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2014-02-06 00:31:14 -0500 |
commit | e3ab1c9c9c7586fe8748127398629e6ef8dc3092 (patch) | |
tree | ee1543c127cf4004d45447bf87758e18c91c0413 | |
parent | 17b6fe48cbb939b1937064035500a13b98118cb5 (diff) | |
download | pycurl-e3ab1c9c9c7586fe8748127398629e6ef8dc3092.tar.gz |
Use raw_filename instead of filename when running with bottle 0.12
-rw-r--r-- | tests/app.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/tests/app.py b/tests/app.py index 78a2064..20658bc 100644 --- a/tests/app.py +++ b/tests/app.py @@ -48,12 +48,25 @@ def convert_file(key, file): 'data': file.read(), } -def convert_file(key, file): - return { - 'name': file.name, - 'filename': file.filename, - 'data': file.file.read().decode(), - } +if hasattr(bottle, 'FileUpload'): + # bottle 0.12 + def convert_file(key, file): + return { + 'name': file.name, + # file.filename lowercases the file name + # https://github.com/defnull/bottle/issues/582 + # raw_filenames is a string on python 3 + 'filename': file.raw_filename, + 'data': file.file.read().decode(), + } +else: + # bottle 0.11 + def convert_file(key, file): + return { + 'name': file.name, + 'filename': file.filename, + 'data': file.file.read().decode(), + } @app.route('/files', method='post') def files(): |