diff options
| author | Tom Christie | 2013-03-07 17:43:13 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-03-07 17:43:13 +0000 |
| commit | a4b33992a5e2affb710d0c16f2286d8ddc81f07c (patch) | |
| tree | 29da9798f52a8ab1376f08b70d729e65caabebd3 /rest_framework/runtests/settings.py | |
| parent | 1d62594fa9ed87545a312681f999bbfa0237491b (diff) | |
| parent | 5a56f92abf5f52ac153c4faa1b75af519c96a207 (diff) | |
| download | django-rest-framework-a4b33992a5e2affb710d0c16f2286d8ddc81f07c.tar.bz2 | |
Merge OAuth2 work.
Diffstat (limited to 'rest_framework/runtests/settings.py')
| -rw-r--r-- | rest_framework/runtests/settings.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index eb3f1115..9b519f27 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -107,8 +107,19 @@ try: except ImportError: pass else: - INSTALLED_APPS += ('oauth_provider',) + INSTALLED_APPS += ( + 'oauth_provider', + ) +try: + import provider +except ImportError: + pass +else: + INSTALLED_APPS += ( + 'provider', + 'provider.oauth2', + ) STATIC_URL = '/static/' |