diff options
| -rw-r--r-- | AUTHORS | 26 | ||||
| -rw-r--r-- | djangorestframework/mixins.py | 9 | ||||
| -rw-r--r-- | djangorestframework/serializer.py | 12 | ||||
| -rw-r--r-- | djangorestframework/tests/mixins.py | 2 |
4 files changed, 26 insertions, 23 deletions
@@ -1,16 +1,18 @@ Tom Christie <tomchristie> - tom@tomchristie.com, @thisneonsoul - Author. -Paul Bagwell <pbgwl> - Suggestions & bugfixes. -Marko Tibold <markotibold> - Contributions & Providing the Jenkins CI Server. -Sébastien Piquemal <sebpiq> - Contributions. -Carmen Wick <cwick> - Bugfixes. -Alex Ehlke <aehlke> - Design Contributions. -Alen Mujezinovic <flashingpumpkin> - Contributions. -Carles Barrobés <txels> - HEAD support. -Michael Fötsch <mfoetsch> - File format support. -David Larlet <david> - OAuth support. -Andrew Straw <astraw> - Bugfixes. -<zeth> - Bugfixes. -<fzunino> - Bugfixes. +Paul Bagwell <pbgwl> +Marko Tibold <markotibold> - Additional thanks for providing & managing the Jenkins CI Server. +Sébastien Piquemal <sebpiq> +Carmen Wick <cwick> +Alex Ehlke <aehlke> +Alen Mujezinovic <flashingpumpkin> +Carles Barrobés <txels> +Michael Fötsch <mfoetsch> +David Larlet <david> +Andrew Straw <astraw> +<zeth> +Fernando Zunino <fzunino> +Jens Alm <ulmus> +Craig Blaszczyk <jakul> THANKS TO: diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py index b1c0d815..bb26ad96 100644 --- a/djangorestframework/mixins.py +++ b/djangorestframework/mixins.py @@ -161,17 +161,18 @@ class RequestMixin(object): return # At this point we're committed to parsing the request as form data. - self._data = data = self.request.POST + self._data = data = self.request.POST.copy() self._files = self.request.FILES # Method overloading - change the method and remove the param from the content. if self._METHOD_PARAM in data: - self._method = data[self._METHOD_PARAM].upper() + # NOTE: unlike `get`, `pop` on a `QueryDict` seems to return a list of values. + self._method = self._data.pop(self._METHOD_PARAM)[0].upper() # Content overloading - modify the content type, and re-parse. if self._CONTENT_PARAM in data and self._CONTENTTYPE_PARAM in data: - self._content_type = data[self._CONTENTTYPE_PARAM] - stream = StringIO(data[self._CONTENT_PARAM]) + self._content_type = self._data.pop(self._CONTENTTYPE_PARAM)[0] + stream = StringIO(self._data.pop(self._CONTENT_PARAM)[0]) (self._data, self._files) = self._parse(stream, self._content_type) diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py index 88ea12d8..22efa5ed 100644 --- a/djangorestframework/serializer.py +++ b/djangorestframework/serializer.py @@ -228,16 +228,16 @@ class Serializer(object): # serialize each required field for fname in fields: - if fname in instance: - # finally check for a key 'fname' on the instance - obj = instance[fname] - elif hasattr(self, smart_str(fname)): - # check for a method 'fname' on self first + if hasattr(self, smart_str(fname)): + # check first for a method 'fname' on self first meth = getattr(self, fname) if inspect.ismethod(meth) and len(inspect.getargspec(meth)[0]) == 2: obj = meth(instance) + elif hasattr(instance, '__contains__') and fname in instance: + # check for a key 'fname' on the instance + obj = instance[fname] elif hasattr(instance, smart_str(fname)): - # now check for an attribute 'fname' on the instance + # finally check for an attribute 'fname' on the instance obj = getattr(instance, fname) else: continue diff --git a/djangorestframework/tests/mixins.py b/djangorestframework/tests/mixins.py index b9aa4c3b..da7c4d86 100644 --- a/djangorestframework/tests/mixins.py +++ b/djangorestframework/tests/mixins.py @@ -107,7 +107,7 @@ class TestModelCreation(TestCase): response = mixin.post(request) self.assertEquals(3, CustomUser.objects.count()) self.assertEquals(2, response.cleaned_content.groups.count()) - self.assertEquals('foo', response.cleaned_content.groups.all()[0].name) + self.assertEquals('foo1', response.cleaned_content.groups.all()[0].name) self.assertEquals('foo2', response.cleaned_content.groups.all()[1].name) |