encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 19:39:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

runtest.settings fixed if django-oauth-plus or oauth2 are not installed

Browse Source 
oauth_provider can be added to INSTALLED_APPS only if these packages are installed
This commit is contained in:
swistakm 2013-02-26 11:27:06 +01:00
parent d84c2cf275
commit a4304458f5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/runtests/settings.py
View File

@ -98,10 +98,18 @@ INSTALLED_APPS = (
'rest_framework', 'rest_framework',
'rest_framework.authtoken', 'rest_framework.authtoken',
'rest_framework.tests', 'rest_framework.tests',
'oauth_provider',
) )
# 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/' STATIC_URL = '/static/'
PASSWORD_HASHERS = ( PASSWORD_HASHERS = (