Fix guardian import (#4612)

tomchristie · web-flow · commit 30bf9df5d0dc · 2016-10-21T16:59:43.000+01:00
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
@@ -207,7 +207,6 @@ def value_from_object(field, obj):
 try:
     if 'guardian' in settings.INSTALLED_APPS:
         import guardian
-        import guardian.shortcuts  # Fixes #1624
 except ImportError:
     pass
 
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -289,6 +289,11 @@ def __init__(self):
     perm_format = '%(app_label)s.view_%(model_name)s'
 
     def filter_queryset(self, request, queryset, view):
+        # We want to defer this import until run-time, rather than import-time.
+        # See https://github.com/tomchristie/django-rest-framework/issues/4608
+        # (Also see #1624 for why we need to make this import explicitly)
+        from guardian.shortcuts import get_objects_for_user
+
         extra = {}
         user = request.user
         model_cls = queryset.model
@@ -302,4 +307,4 @@ def filter_queryset(self, request, queryset, view):
             extra = {'accept_global_perms': False}
         else:
             extra = {}
-        return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)
+        return get_objects_for_user(user, permission, queryset, **extra)
