From 5397dec04fe83092a56ba14a843731f2aa08184d Mon Sep 17 00:00:00 2001 From: Daniel Lindsley Date: Tue, 14 Aug 2012 00:10:18 -0500 Subject: [PATCH] Corrected how query terms are found, for Django 1.5 compatibility. Thanks to maraujop for the original patch! --- tastypie/resources.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tastypie/resources.py b/tastypie/resources.py index 620069704..252fd52d8 100644 --- a/tastypie/resources.py +++ b/tastypie/resources.py @@ -1733,7 +1733,12 @@ def build_filters(self, filters=None): if hasattr(self._meta, 'queryset'): # Get the possible query terms from the current QuerySet. - query_terms = self._meta.queryset.query.query_terms.keys() + if hasattr(self._meta.queryset.query.query_terms, 'keys'): + # Django 1.4 & below compatibility. + query_terms = self._meta.queryset.query.query_terms.keys() + else: + # Django 1.5+. + query_terms = self._meta.queryset.query.query_terms else: query_terms = QUERY_TERMS.keys()