Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

1 files changed, 3 insertions, 1 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index b0c0efa7..9226895e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -517,7 +517,9 @@ class ListSerializer(BaseSerializer):
         """
         List of object instances -> List of dicts of primitive datatypes.
         """
-        iterable = data.all() if (hasattr(data, 'all')) else data
+        # Dealing with nested relationships, data can be a Manager,
+        # so, first get a queryset from the Manager if needed
+        iterable = data.all() if isinstance(data, models.Manager) else data
         return [
             self.child.to_representation(item) for item in iterable
         ]