diff options
| author | Tom Christie | 2013-03-07 09:01:53 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-03-07 09:01:53 +0000 |
| commit | d4e3610e716f2fbbda32aefb972e604446054127 (patch) | |
| tree | db9daafbe8736d7c8854bd5ef4c310ad1dd6cb0b /rest_framework/runtests/settings.py | |
| parent | ddd7125a63c5187483058bad27c94676b9b6c16e (diff) | |
| parent | 2eabc5c2b46d9f4cc7a467af849ff31397b9d7bf (diff) | |
| download | django-rest-framework-d4e3610e716f2fbbda32aefb972e604446054127.tar.bz2 | |
Merge & clean OAuth support
Diffstat (limited to 'rest_framework/runtests/settings.py')
| -rw-r--r-- | rest_framework/runtests/settings.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index 03bfc216..eb3f1115 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -97,9 +97,19 @@ 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',) + + STATIC_URL = '/static/' PASSWORD_HASHERS = ( |