diff options
| author | Tom Christie | 2015-01-23 14:28:59 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-01-23 14:28:59 +0000 | 
| commit | 39f26c9eca6fa8b749f9197ad78e5cba69870e50 (patch) | |
| tree | 86ebd311194a185217e6fefb31d16316bf80779f /rest_framework/parsers.py | |
| parent | 37dc2520f9adbaf54de759a1fdc41985ebd38a0e (diff) | |
| parent | 4201c9fb01beae84fc34a5b74e138e721de42de1 (diff) | |
| download | django-rest-framework-39f26c9eca6fa8b749f9197ad78e5cba69870e50.tar.bz2 | |
Merge master
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 dd069840..7a51bb05 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -200,7 +200,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): | 
