From fe048dc4fbf064b11d7247061c931bb1038cc774 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 28 Jul 2014 07:37:30 +0200
Subject: Fix #1712 (issue when django-guardian is installed but not
 configured/used)

---
 rest_framework/compat.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index fdf12448..9ad8b0d2 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -48,12 +48,15 @@ try:
 except ImportError:
     django_filters = None
 
-# guardian is optional
-try:
-    import guardian
-    import guardian.shortcuts  # Fixes #1624
-except ImportError:
-    guardian = None
+# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
+# Fixes (#1712). We keep the try/except for the test suite.
+guardian = None
+if 'guardian' in settings.INSTALLED_APPS:
+    try:
+        import guardian
+        import guardian.shortcuts  # Fixes #1624
+    except ImportError:
+        pass
 
 
 # cStringIO only if it's available, otherwise StringIO
-- 
cgit v1.2.3