aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/resources.py
diff options
context:
space:
mode:
authorTom Christie2011-06-12 20:23:40 +0100
committerTom Christie2011-06-12 20:23:40 +0100
commitebc5a9974d6cffb6df89f326e8d4466b5faaeeba (patch)
treec9a8690f878faeabc1cd64cd8f8e86c093ec7e7c /djangorestframework/resources.py
parentf854bc9065e53882a83a7878cdaaace15e32acca (diff)
downloaddjango-rest-framework-ebc5a9974d6cffb6df89f326e8d4466b5faaeeba.tar.bz2
Fix file uploads
Diffstat (limited to 'djangorestframework/resources.py')
-rw-r--r--djangorestframework/resources.py2
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()