aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rest_framework/fields.py4
-rw-r--r--rest_framework/tests/genericrelations.py2
2 files changed, 1 insertions, 5 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 33f25a00..bb9a523d 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -83,10 +83,6 @@ class Field(object):
if is_protected_type(value):
return value
-
- all_callable = getattr(value, 'all', None)
- if is_simple_callable(all_callable):
- return [self.to_native(item) for item in value.all()]
elif hasattr(value, '__iter__') and not isinstance(value, (dict, basestring)):
return [self.to_native(item) for item in value]
return smart_unicode(value)
diff --git a/rest_framework/tests/genericrelations.py b/rest_framework/tests/genericrelations.py
index d88a6c06..1d7e33bc 100644
--- a/rest_framework/tests/genericrelations.py
+++ b/rest_framework/tests/genericrelations.py
@@ -19,7 +19,7 @@ class TestGenericRelations(TestCase):
def test_reverse_generic_relation(self):
class BookmarkSerializer(serializers.ModelSerializer):
- tags = serializers.Field(source='tags')
+ tags = serializers.ManyRelatedField(source='tags')
class Meta:
model = Bookmark