Merge pull request #3165 from tomchristie/guardian-1-3-support

tomchristie · tomchristie · commit b22658536d2e · 2015-07-16T16:55:30.000+01:00
Upgrade guardian support to 1.3.
diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
@@ -1,4 +1,4 @@
 # Optional packages which may be used with REST framework.
 markdown==2.5.2
-django-guardian==1.2.5
+django-guardian==1.3.0
 django-filter==0.10.0
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -198,4 +198,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
`@@ -198,4 +198,7 @@ def filter_queryset(self, request, queryset, view):`
`198`	`198`	`'model_name': get_model_name(model_cls)`
`199`	`199`	`}`
`200`	`200`	`permission = self.perm_format % kwargs`
`201`		`- return guardian.shortcuts.get_objects_for_user(user, permission, queryset)`
	`201`	`+ if guardian.VERSION >= (1, 3):`
	`202`	`+ # Maintain behavior compatibility with versions prior to 1.3`
	`203`	`+ extra = {'accept_global_perms': False}`
	`204`	`+ return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)`