aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Prezument2013-01-03 08:28:17 +0200
committerYuri Prezument2013-01-03 08:28:17 +0200
commit3f5e938247ab05efbc8e9a2a21ef1a610231a763 (patch)
tree8ff255a051b914a6bc317ac0fe8123e3afb0f168
parentf2625fc38cdafd795981bd72134b84d6a2c79841 (diff)
downloaddjango-rest-framework-3f5e938247ab05efbc8e9a2a21ef1a610231a763.tar.bz2
Some cleanup
-rw-r--r--rest_framework/fields.py2
-rw-r--r--rest_framework/tests/files.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index a4cc7f3b..a022fe09 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -181,7 +181,7 @@ class WritableField(Field):
try:
if self._use_files:
- files = files or {} # For the case when files==None
+ files = files or {}
native = files[field_name]
else:
native = data[field_name]
diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index a98e33ef..446e23c0 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -46,6 +46,6 @@ class FileSerializerTests(TestCase):
"""
now = datetime.datetime.now()
- serializer = UploadedFileSerializer(data={'created': now}, files=None)
+ serializer = UploadedFileSerializer(data={'created': now})
self.assertFalse(serializer.is_valid())
self.assertIn('file', serializer.errors)