encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 11:33:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #651 from fernandogrd/master

Browse Source 
DictWithMetadata.__getstate__ was never called (Fix for 645)
This commit is contained in:
Tom Christie 2013-02-11 23:27:35 -08:00
commit aa03425c09
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/serializers.py
View File

@ -33,7 +33,7 @@ class DictWithMetadata(dict):
""" """
# return an instance of the first dict in MRO that isn't a DictWithMetadata # return an instance of the first dict in MRO that isn't a DictWithMetadata
for base in self.__class__.__mro__: for base in self.__class__.__mro__:
if not isinstance(base, DictWithMetadata) and isinstance(base, dict): if not issubclass(base, DictWithMetadata) and issubclass(base, dict):
return base(self) return base(self)

7
rest_framework/tests/serializer.py
View File

@ -900,6 +900,13 @@ class SerializerPickleTests(TestCase):
fields = ('name', 'age') fields = ('name', 'age')
pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data) pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data)
def test_getstate_method_should_not_return_none(self):
'''Regression test for
https://github.com/tomchristie/django-rest-framework/issues/645
'''
d = serializers.DictWithMetadata({1:1})
self.assertEqual(d.__getstate__(), serializers.SortedDict({1:1}))
class DepthTest(TestCase): class DepthTest(TestCase):
def test_implicit_nesting(self): def test_implicit_nesting(self):