From 22f059a25ab5a1f03f59fc38c73ef3601188cccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20M=C3=BCllegger?= Date: Sat, 15 Nov 2014 14:35:37 +0100 Subject: [PATCH] Fixing QuerySet import for Django < 1.7. --- rest_framework/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6c1a461ed..f938704d7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,6 +12,7 @@ response content is handled by parsers and renderers. """ from django.core.exceptions import ImproperlyConfigured from django.db import models +from django.db.models.query import QuerySet from django.db.models.fields import FieldDoesNotExist from django.utils import six from django.utils.translation import ugettext_lazy as _ @@ -81,7 +82,7 @@ class BaseSerializer(Field): if not kwargs.pop('many_init', False): if not issubclass(cls, ListSerializer): instance = kwargs.get('instance', args[0] if args else None) - if isinstance(instance, (list, tuple, models.QuerySet)): + if isinstance(instance, (list, tuple, QuerySet)): msg = ( 'You have passed a %s as `instance` argument but did ' 'not set `many=True`.' % instance.__class__.__name__)