Merge pull request #4003 from blaze33/patch-1

jpadilla · jpadilla · commit e946a496dc4d · 2016-03-19T11:39:53.000-04:00
Fixed use of deprecated Query.aggregates
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -245,7 +245,7 @@ def get_valid_fields(self, queryset, view):
             ]
             valid_fields += [
                 (key, key.title().split('__'))
-                for key in queryset.query.aggregates.keys()
+                for key in queryset.query.annotations.keys()
             ]
         else:
             valid_fields = [

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ def get_valid_fields(self, queryset, view):`
`245`	`245`	`]`
`246`	`246`	`valid_fields += [`
`247`	`247`	`(key, key.title().split('__'))`
`248`		`- for key in queryset.query.aggregates.keys()`
	`248`	`+ for key in queryset.query.annotations.keys()`
`249`	`249`	`]`
`250`	`250`	`else:`
`251`	`251`	`valid_fields = [`