Cherry picks

tomchristie · damycra · commit 152035aee73a · 2015-07-23T20:37:44.000+01:00
Upgrade guardian support to 1.3. encode#3165
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -188,4 +188,7 @@ def filter_queryset(self, request, queryset, view):
             'model_name': get_model_name(model_cls)
         }
         permission = self.perm_format % kwargs
-        return guardian.shortcuts.get_objects_for_user(user, permission, queryset)
+        if guardian.VERSION >= (1, 3):
+            # Maintain behavior compatibility with versions prior to 1.3
+            extra = {'accept_global_perms': False}
+        return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)

Original file line number	Diff line number	Diff line change
`@@ -188,4 +188,7 @@ def filter_queryset(self, request, queryset, view):`
`188`	`188`	`'model_name': get_model_name(model_cls)`
`189`	`189`	`}`
`190`	`190`	`permission = self.perm_format % kwargs`
`191`		`- return guardian.shortcuts.get_objects_for_user(user, permission, queryset)`
	`191`	`+ if guardian.VERSION >= (1, 3):`
	`192`	`+ # Maintain behavior compatibility with versions prior to 1.3`
	`193`	`+ extra = {'accept_global_perms': False}`
	`194`	`+ return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)`