From d470a2c173ceb2702b9d0de26aee31f2df9caad3 Mon Sep 17 00:00:00 2001 From: Guilherme Gondim Date: Mon, 2 Feb 2015 18:58:59 -0500 Subject: [PATCH] Fix TypeError: 'NoneType' object is not iterable There is some cases that ``self.child_relation.queryset`` is None (in a ManyToManyField for example) instead a empty list/QuerySet --- rest_framework/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 13793f375..4fe28b19e 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -365,7 +365,7 @@ class ManyRelatedField(Field): @property def choices(self): queryset = self.child_relation.queryset - iterable = queryset.all() if (hasattr(queryset, 'all')) else queryset + iterable = queryset.all() if (hasattr(queryset, 'all')) else queryset or [] items_and_representations = [ (item, self.child_relation.to_representation(item)) for item in iterable