Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
e5040fbf
Commit
e5040fbf
authored
Apr 30, 2013
by
Danilo Bargen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Catch ImproperlyConfigured exception in compat.py (fixes #803)
parent
5d357a9b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
rest_framework/compat.py
+2
-1
No files found.
rest_framework/compat.py
View file @
e5040fbf
...
@@ -6,6 +6,7 @@ versions of django/python, and compatibility wrappers around optional packages.
...
@@ -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
:
...
@@ -473,7 +474,7 @@ except ImportError:
...
@@ -473,7 +474,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment