encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-10 19:56:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1712 (issue when django-guardian is installed but not configured/used)

Browse Source
This commit is contained in:
Xavier Ordoquy 2014-07-28 07:37:30 +02:00
parent 299a8347e8
commit fe048dc4fb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rest_framework/compat.py
View File

@ -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