encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-30 14:03:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not access settings on compat import

Browse Source
This commit is contained in:
Tom Christie 2015-09-03 14:22:13 +01:00
parent 7905e9f9f4
commit 39ec564ae9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/compat.py
View File

@ -94,12 +94,11 @@ else:
# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
# 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
if 'guardian' in settings.INSTALLED_APPS: try:
try: import guardian
import guardian import guardian.shortcuts # Fixes #1624
import guardian.shortcuts # Fixes #1624 except ImportError:
except ImportError: pass
pass
def get_model_name(model_cls): def get_model_name(model_cls):