encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-29 17:39:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge e5040fbf94 into 5d357a9b08

Browse Source
This commit is contained in:
Danilo Bargen 2013-04-30 14:27:33 -07:00
commit bffa1079c3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/compat.py
View File

@ -6,6 +6,7 @@ versions of django/python, and compatibility wrappers around optional packages.
from __future__ import unicode_literals
import django
from django.core.exceptions import ImproperlyConfigured
# Try to import six from Django, fallback to included `six`.
try:
@ -473,7 +474,7 @@ except ImportError:
try:
import oauth_provider
from oauth_provider.store import store as oauth_provider_store
except ImportError:
except (ImportError, ImproperlyConfigured):
oauth_provider = None
oauth_provider_store = None