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

Merge branch 'master' into 2.3

Browse Source
This commit is contained in:
Tom Christie 2013-05-05 16:48:46 +01:00
commit 75b2afcb23
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 from __future__ import unicode_literals
import django import django
from django.core.exceptions import ImproperlyConfigured
# Try to import six from Django, fallback to included `six`. # Try to import six from Django, fallback to included `six`.
try: try:
@ -477,7 +478,7 @@ except ImportError:
try: try:
import oauth_provider import oauth_provider
from oauth_provider.store import store as oauth_provider_store from oauth_provider.store import store as oauth_provider_store
except ImportError: except (ImportError, ImproperlyConfigured):
oauth_provider = None oauth_provider = None
oauth_provider_store = None oauth_provider_store = None