diff options
| author | Tom Christie | 2015-01-23 13:13:05 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-23 13:13:05 +0000 |
| commit | d1fe3f65488e7ffac038e475e0575b2f3f93fda4 (patch) | |
| tree | ff70fe65a8ed03345b4c74198b5c7d96773f578f /rest_framework/parsers.py | |
| parent | e56f0a928c7ec6af15a283fc48a7dded31a7d113 (diff) | |
| parent | 04a5f7bf0a268d24656ef3659f85aec95fd7590a (diff) | |
| download | django-rest-framework-d1fe3f65488e7ffac038e475e0575b2f3f93fda4.tar.bz2 | |
Merge pull request #2446 from tomchristie/django-18-alpha
Support 1.8-alpha.
Diffstat (limited to 'rest_framework/parsers.py')
| -rw-r--r-- | rest_framework/parsers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 401856ec..ef72677c 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -298,7 +298,7 @@ class FileUploadParser(BaseParser): if 'filename*' in filename_parm: return self.get_encoded_filename(filename_parm) return force_text(filename_parm['filename']) - except (AttributeError, KeyError): + except (AttributeError, KeyError, ValueError): pass def get_encoded_filename(self, filename_parm): |