encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 19:39:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3485 from dulmandakh/dulmandakh-guardian-check-installed-apps

Browse Source 
Update compat.py
This commit is contained in:
Xavier Ordoquy 2015-10-09 08:13:42 +02:00
commit fa1cfae991
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/compat.py
View File

@ -81,8 +81,9 @@ except ImportError:
# Fixes (#1712). We keep the try/except for the test suite. # Fixes (#1712). We keep the try/except for the test suite.
guardian = None guardian = None
try: try:
import guardian if 'guardian' in settings.INSTALLED_APPS:
import guardian.shortcuts # Fixes #1624 import guardian
import guardian.shortcuts # Fixes #1624
except ImportError: except ImportError:
pass pass