Merge OAuth2 work.

1 files changed, 18 insertions, 0 deletions

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 6efe6762..69be9543 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -441,3 +441,21 @@ try:
 except ImportError:
     oauth_provider = None
     oauth_provider_store = None
+
+# OAuth 2 support is optional
+try:
+    import provider.oauth2 as oauth2_provider
+    # # Hack to fix submodule import issues
+    # submodules = ['backends', 'forms', 'managers', 'models', 'urls', 'views']
+    # for s in submodules:
+    #     mod = __import__('provider.oauth2.%s.*' % s)
+    #     setattr(oauth2_provider, s, mod)
+    from provider.oauth2 import backends as oauth2_provider_backends
+    from provider.oauth2 import models as oauth2_provider_models
+    from provider.oauth2 import forms as oauth2_provider_forms
+
+except ImportError:
+    oauth2_provider = None
+    oauth2_provider_backends = None
+    oauth2_provider_models = None
+    oauth2_provider_forms = None