diff options
| author | Danilo Bargen | 2011-07-27 18:32:19 +0300 |
|---|---|---|
| committer | Danilo Bargen | 2011-07-27 18:32:19 +0300 |
| commit | e3c00e4c1e0d64c8b0f0b04e6e7a7e1a308099f2 (patch) | |
| tree | b5e1c90c4e117865b7dd634baa823fa46621ef21 /djangorestframework/resources.py | |
| parent | 746b817ad34af712d362539583bfdbcf5b84adc1 (diff) | |
| download | django-rest-framework-e3c00e4c1e0d64c8b0f0b04e6e7a7e1a308099f2.tar.bz2 | |
Fixed TypeError that occurs without request data.
If no request data gets sent, allowed_extra_fields is a set and can't be joined to a tuple using the + operator.
Diffstat (limited to 'djangorestframework/resources.py')
| -rw-r--r-- | djangorestframework/resources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py index f4a2ab14..99c45244 100644 --- a/djangorestframework/resources.py +++ b/djangorestframework/resources.py @@ -111,7 +111,7 @@ class FormResource(Resource): # To get around this case we revalidate with some fake data. if fake_data: data[fake_data] = '_fake_data' - allowed_extra_fields = allowed_extra_fields + ('_fake_data',) + allowed_extra_fields = tuple(allowed_extra_fields) + ('_fake_data',) bound_form = self.get_bound_form(data, files) |