encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 19:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

bugfix. tests adjusted

Browse Source
This commit is contained in:
lukasbuenger 2013-09-17 09:21:35 +02:00
parent 37976b11fa
commit 83bdfcb479
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/genericrelations.py
View File

@ -53,8 +53,6 @@ class GenericRelatedField(serializers.WritableField):
# Get the serializer responsible for input resolving # Get the serializer responsible for input resolving
serializer = self.determine_serializer_for_data(value) serializer = self.determine_serializer_for_data(value)
serializer.initialize(self.parent, self.source) serializer.initialize(self.parent, self.source)
import pdb
pdb.set_trace()
return serializer.from_native(value) return serializer.from_native(value)
def determine_deserializer_for_data(self, value): def determine_deserializer_for_data(self, value):
@ -75,7 +73,8 @@ class GenericRelatedField(serializers.WritableField):
serializer.from_native(value) serializer.from_native(value)
# Collects all serializers that can handle the input data. # Collects all serializers that can handle the input data.
serializers.append(serializer) serializers.append(serializer)
except Exception: except Exception as e:
print e
pass pass
# If no serializer found, raise error. # If no serializer found, raise error.
l = len(serializers) l = len(serializers)

2
rest_framework/tests/relations_generic.py
View File

@ -245,7 +245,6 @@ class TestGenericRelatedFieldSerialization(TestCase):
}) })
self.assertRaises(ConfigurationError, serializer.is_valid) self.assertRaises(ConfigurationError, serializer.is_valid)
def test_not_registered_view_name(self): def test_not_registered_view_name(self):
class TagSerializer(serializers.ModelSerializer): class TagSerializer(serializers.ModelSerializer):
tagged_item = GenericRelatedField({ tagged_item = GenericRelatedField({
@ -263,6 +262,7 @@ class TestGenericRelatedFieldSerialization(TestCase):
self.assertFalse(serializer.is_valid()) self.assertFalse(serializer.is_valid())
def test_invalid_url(self): def test_invalid_url(self):
# Should fail ATM
class TagSerializer(serializers.ModelSerializer): class TagSerializer(serializers.ModelSerializer):
tagged_item = GenericRelatedField({ tagged_item = GenericRelatedField({
Bookmark: serializers.HyperlinkedRelatedField(view_name='bookmark-detail'), Bookmark: serializers.HyperlinkedRelatedField(view_name='bookmark-detail'),