diff options
| author | Tom Christie | 2013-10-03 05:07:07 -0700 |
|---|---|---|
| committer | Tom Christie | 2013-10-03 05:07:07 -0700 |
| commit | 38049d11b63cdcc7f2a71ac51600182545912350 (patch) | |
| tree | 399110e75bc1c3b2fbddd314526c3c17f9d68574 /rest_framework/fields.py | |
| parent | c3175900bc0681965d07d85c8b9010534e0ff901 (diff) | |
| parent | a2ae469f6ba6ed7e69e9c6a7741876ae14a36057 (diff) | |
| download | django-rest-framework-38049d11b63cdcc7f2a71ac51600182545912350.tar.bz2 | |
Merge pull request #1104 from FreakyDug/master
Fix a TypeError when a serializer is created with files but no data
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 210c2537..0c3817b5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -306,6 +306,7 @@ class WritableField(Field): return try: + data = data or {} if self.use_files: files = files or {} try: |