encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 04:07:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 10e5aa19eecaec9be297dd8f090eb56c60089a6d

Browse Source
This commit is contained in:
markotibold 2011-06-12 00:37:24 +02:00
commit 5a188d8c90
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
djangorestframework/resources.py
View File

@ -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()

12
djangorestframework/tests/files.py
View File

@ -12,20 +12,16 @@ class UploadFilesTests(TestCase):
def test_upload_file(self):
class FileForm(forms.Form):
file = forms.FileField
class MockResource(FormResource):
form = FileForm
file = forms.FileField()
class MockView(View):
permissions = ()
resource = MockResource
form = FileForm
def post(self, request, *args, **kwargs):
return {'FILE_NAME': self.CONTENT['file'][0].name,
'FILE_CONTENT': self.CONTENT['file'][0].read()}
return {'FILE_NAME': self.CONTENT['file'].name,
'FILE_CONTENT': self.CONTENT['file'].read()}
file = StringIO.StringIO('stuff')
file.name = 'stuff.txt'