encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 08:00:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #545 from yprez/filefield-no-files_issue542

Browse Source 
FileField validation with files=None
This commit is contained in:
Yuri Prezument 2013-01-03 01:11:16 -08:00
commit ed9f20823b
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/topics/release-notes.md
View File

@ -21,6 +21,7 @@ Major version numbers (x.0.0) are reserved for project milestones. No major poi
* Added `PATCH` support. * Added `PATCH` support.
* Added `RetrieveUpdateAPIView`. * Added `RetrieveUpdateAPIView`.
* Relation changes are now persisted in `save` instead of in `.restore_object`. * Relation changes are now persisted in `save` instead of in `.restore_object`.
* Bugfix: Fix issue with FileField validation with files=None.
### 2.1.14 ### 2.1.14

1
rest_framework/fields.py
View File

@ -181,6 +181,7 @@ class WritableField(Field):
try: try:
if self._use_files: if self._use_files:
files = files or {}
native = files[field_name] native = files[field_name]
else: else:
native = data[field_name] native = data[field_name]

14
rest_framework/tests/files.py
View File

@ -25,7 +25,6 @@ class UploadedFileSerializer(serializers.Serializer):
class FileSerializerTests(TestCase): class FileSerializerTests(TestCase):
def test_create(self): def test_create(self):
now = datetime.datetime.now() now = datetime.datetime.now()
file = StringIO.StringIO('stuff') file = StringIO.StringIO('stuff')
@ -37,3 +36,16 @@ class FileSerializerTests(TestCase):
self.assertEquals(serializer.object.created, uploaded_file.created) self.assertEquals(serializer.object.created, uploaded_file.created)
self.assertEquals(serializer.object.file, uploaded_file.file) self.assertEquals(serializer.object.file, uploaded_file.file)
self.assertFalse(serializer.object is uploaded_file) self.assertFalse(serializer.object is uploaded_file)
def test_creation_failure(self):
"""
Passing files=None should result in an ValidationError
Regression test for:
https://github.com/tomchristie/django-rest-framework/issues/542
"""
now = datetime.datetime.now()
serializer = UploadedFileSerializer(data={'created': now})
self.assertFalse(serializer.is_valid())
self.assertIn('file', serializer.errors)