aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/runtests/settings.py
diff options
context:
space:
mode:
authorTom Christie2013-03-12 12:27:05 -0700
committerTom Christie2013-03-12 12:27:05 -0700
commit40e3fc0eee96b85140ea020e321cf403956fbb80 (patch)
tree7735202eec798c41586460e5ea504f8f39504434 /rest_framework/runtests/settings.py
parent20880232930dd6f3a1de9dda1546c84b9279a258 (diff)
parentf513db714db76849448bf2e2412428ee7121ebf6 (diff)
downloaddjango-rest-framework-40e3fc0eee96b85140ea020e321cf403956fbb80.tar.bz2
Merge pull request #709 from tomchristie/oauth
OAuth support
Diffstat (limited to 'rest_framework/runtests/settings.py')
-rw-r--r--rest_framework/runtests/settings.py23
1 files changed, 22 insertions, 1 deletions
diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index 03bfc216..9b519f27 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -97,9 +97,30 @@ INSTALLED_APPS = (
# 'django.contrib.admindocs',
'rest_framework',
'rest_framework.authtoken',
- 'rest_framework.tests'
+ 'rest_framework.tests',
)
+# OAuth is optional and won't work if there is no oauth_provider & oauth2
+try:
+ import oauth_provider
+ import oauth2
+except ImportError:
+ pass
+else:
+ INSTALLED_APPS += (
+ 'oauth_provider',
+ )
+
+try:
+ import provider
+except ImportError:
+ pass
+else:
+ INSTALLED_APPS += (
+ 'provider',
+ 'provider.oauth2',
+ )
+
STATIC_URL = '/static/'
PASSWORD_HASHERS = (