diff options
| author | Xavier Ordoquy | 2014-04-14 10:55:56 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-04-14 10:55:56 +0200 |
| commit | f6329b7b5df4b5011d318c25cb7ca288dc22ea42 (patch) | |
| tree | c09f9998aca21cb2e1ff8c880b089c5408397ba7 /rest_framework | |
| parent | 93b9245b8714287a440023451ff7880a2f6e5b32 (diff) | |
| parent | 063addabfeb716f54c5784917e92ab6abb635ff5 (diff) | |
| download | django-rest-framework-f6329b7b5df4b5011d318c25cb7ca288dc22ea42.tar.bz2 | |
Merge pull request #1529 from vlastv/patch-1
Fixed parse file name
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/parsers.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/test_parsers.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index f1b3e38d..703cefca 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -288,7 +288,7 @@ class FileUploadParser(BaseParser): try: meta = parser_context['request'].META - disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION']) + disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) return disposition[1]['filename'] except (AttributeError, KeyError): pass diff --git a/rest_framework/tests/test_parsers.py b/rest_framework/tests/test_parsers.py index 7699e10c..ffd6b360 100644 --- a/rest_framework/tests/test_parsers.py +++ b/rest_framework/tests/test_parsers.py @@ -96,7 +96,7 @@ class TestFileUploadParser(TestCase): request = MockRequest() request.upload_handlers = (MemoryFileUploadHandler(),) request.META = { - 'HTTP_CONTENT_DISPOSITION': 'Content-Disposition: inline; filename=file.txt'.encode('utf-8'), + 'HTTP_CONTENT_DISPOSITION': 'Content-Disposition: inline; filename=file.txt', 'HTTP_CONTENT_LENGTH': 14, } self.parser_context = {'request': request, 'kwargs': {}} |