diff options
| author | Tom Christie | 2011-06-30 08:52:55 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-06-30 08:52:55 +0100 |
| commit | 8bafa01abd9bcc104aa413f09ab9505abb3526a2 (patch) | |
| tree | 2004deddadbe45ec19f4a4a2bb68cb409351f841 /djangorestframework/runtests/settings.py | |
| parent | 5d61ff3508611f3c89de3bd98fead581fef5757c (diff) | |
| download | django-rest-framework-8bafa01abd9bcc104aa413f09ab9505abb3526a2.tar.bz2 | |
Tidy up oauth imports slightly
Diffstat (limited to 'djangorestframework/runtests/settings.py')
| -rw-r--r-- | djangorestframework/runtests/settings.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py index 006727bc..9b3c2c92 100644 --- a/djangorestframework/runtests/settings.py +++ b/djangorestframework/runtests/settings.py @@ -84,7 +84,7 @@ TEMPLATE_DIRS = ( # Don't forget to use absolute paths, not relative paths. ) -INSTALLED_APPS = [ +INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -95,15 +95,15 @@ INSTALLED_APPS = [ # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'djangorestframework', -] +) # OAuth support is optional, so we only test oauth if it's installed. try: import oauth_provider -except: +except ImportError: pass else: - INSTALLED_APPS.append('oauth_provider') + INSTALLED_APPS += ('oauth_provider',) # If we're running on the Jenkins server we want to archive the coverage reports as XML. import os |
