Merge branch 'master' into 2.3

lovelydinosaur · lovelydinosaur · commit 75b2afcb23d0 · 2013-05-05T16:48:46.000+01:00
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:
@@ -477,7 +478,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
 
