diff options
| author | markotibold | 2011-06-12 00:37:24 +0200 |
|---|---|---|
| committer | markotibold | 2011-06-12 00:37:24 +0200 |
| commit | 5a188d8c906a2ea969993225fa5c1337c9b97e56 (patch) | |
| tree | fa11df5c28be983640e8a38017361e38bde11faa /djangorestframework/resources.py | |
| parent | 5be359fb29b1042674c18d563575146dc35e4163 (diff) | |
| parent | ebc5a9974d6cffb6df89f326e8d4466b5faaeeba (diff) | |
| download | django-rest-framework-5a188d8c906a2ea969993225fa5c1337c9b97e56.tar.bz2 | |
Merge with 10e5aa19eecaec9be297dd8f090eb56c60089a6d
Diffstat (limited to 'djangorestframework/resources.py')
| -rw-r--r-- | djangorestframework/resources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py index cc4b6471..07c97d43 100644 --- a/djangorestframework/resources.py +++ b/djangorestframework/resources.py @@ -314,7 +314,7 @@ class FormResource(Resource): if not form: return None - if data is not None: + if data is not None or files is not None: return form(data, files) return form() |