Merge pull request encode#804 from dbrgn/iss803

lovelydinosaur · lovelydinosaur · commit 198b679e0295 · 2013-05-01T09:54:07.000-07:00
Catch ImproperlyConfigured exception in compat.py
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
@@ -6,6 +6,7 @@
 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 @@ def apply_markdown(text):
 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
 
