diff options
| author | Tom Christie | 2013-08-23 11:56:22 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-08-23 11:56:22 +0100 |
| commit | 47d17b088a627dc4cdf3f245f1f351fa6b34ff7d (patch) | |
| tree | 6cca776cf515b15839ca4a9b548d598712f4d418 /rest_framework/fields.py | |
| parent | dba602781355f6ee0cbc34775209cd37a52ca4d4 (diff) | |
| parent | db9672d3048eebb3d3c3fb2b4a345e17b5aa23cc (diff) | |
| download | django-rest-framework-47d17b088a627dc4cdf3f245f1f351fa6b34ff7d.tar.bz2 | |
Merge branch 'fix_937' of git://github.com/aburgel/django-rest-framework into aburgel-fix_937
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 07779c47..3e0ca1a1 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -308,7 +308,10 @@ class WritableField(Field): try: if self.use_files: files = files or {} - native = files[field_name] + try: + native = files[field_name] + except KeyError: + native = data[field_name] else: native = data[field_name] except KeyError: |