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

changing order of imports (#4601)

Browse Source 
when using with django-filter and rest_framework_swagger need to import coreapi before django-filter as django filter tries to load rest_framework.coreapi which is undefined at this point
This commit is contained in:
Lukasz Karolewski 2016-10-21 07:00:25 -07:00 committed by Tom Christie
parent e3686aca93
commit 0b346e94b1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rest_framework/compat.py
View File

@ -170,6 +170,16 @@ except ImportError:
JSONField = None JSONField = None
# coreapi is optional (Note that uritemplate is a dependency of coreapi)
try:
import coreapi
import uritemplate
except (ImportError, SyntaxError):
# SyntaxError is possible under python 3.2
coreapi = None
uritemplate = None
# django-filter is optional # django-filter is optional
try: try:
import django_filters import django_filters
@ -184,16 +194,6 @@ except ImportError:
crispy_forms = None crispy_forms = None
# coreapi is optional (Note that uritemplate is a dependency of coreapi)
try:
import coreapi
import uritemplate
except (ImportError, SyntaxError):
# SyntaxError is possible under python 3.2
coreapi = None
uritemplate = None
# requests is optional # requests is optional
try: try:
import requests import requests