aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2011-07-27 08:53:41 -0700
committerTom Christie2011-07-27 08:53:41 -0700
commit53fcf290811f062c54939f40db1cd7c06544f002 (patch)
treeb5e1c90c4e117865b7dd634baa823fa46621ef21
parent746b817ad34af712d362539583bfdbcf5b84adc1 (diff)
parente3c00e4c1e0d64c8b0f0b04e6e7a7e1a308099f2 (diff)
downloaddjango-rest-framework-53fcf290811f062c54939f40db1cd7c06544f002.tar.bz2
Merge pull request #59 from gwrtheyrn/patch-1
Fixed TypeError that occurs without request data.
-rw-r--r--djangorestframework/resources.py2
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)