diff options
| author | Vladislav Vlastovskiy | 2014-04-14 15:03:50 +0400 |
|---|---|---|
| committer | Jason Bittel | 2014-09-05 14:52:01 -0700 |
| commit | bcca9ed0fd0af251e5a64be0ab7865b396d6b4b8 (patch) | |
| tree | d871eaafece2deb36043fa20e906033df23c40d5 /rest_framework/parsers.py | |
| parent | 644f9b54219c884b59793eafbbdafa0d1175f1ab (diff) | |
| download | django-rest-framework-bcca9ed0fd0af251e5a64be0ab7865b396d6b4b8.tar.bz2 | |
Removed use encoding available only in py3
Diffstat (limited to 'rest_framework/parsers.py')
| -rw-r--r-- | rest_framework/parsers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index f285ac97..c67f0088 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -291,15 +291,15 @@ class FileUploadParser(BaseParser): meta = parser_context['request'].META disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) - filename = force_text(disposition[1]['filename']) - if 'filename*' in disposition[1]: filename_encoded = force_text(disposition[1]['filename*']) try: charset, filename_encoded = filename_encoded.split('\'\'', 1) - filename = urlparse.unquote(filename_encoded, charset) + filename = urlparse.unquote(filename_encoded) except (ValueError, LookupError): - pass + filename = force_text(disposition[1]['filename']) + else: + filename = force_text(disposition[1]['filename']) return filename except (AttributeError, KeyError): |