diff options
| author | Sébastien Piquemal | 2012-02-02 08:39:15 +0200 | 
|---|---|---|
| committer | Sébastien Piquemal | 2012-02-02 08:39:15 +0200 | 
| commit | 5f59d90645dfddc293bbbbc4ca9b4c3f3125b590 (patch) | |
| tree | aa3d091a1f61f5717f7f1a9e96334308bb13c7d9 /djangorestframework/runtests/settings.py | |
| parent | 152c385f4de37558fe4e522abad5b97f0cf7ddce (diff) | |
| parent | 894f63259880252ed5317ce485eb13c4429b65c1 (diff) | |
| download | django-rest-framework-5f59d90645dfddc293bbbbc4ca9b4c3f3125b590.tar.bz2 | |
merged with trunk's master
Diffstat (limited to 'djangorestframework/runtests/settings.py')
| -rw-r--r-- | djangorestframework/runtests/settings.py | 8 | 
1 files changed, 8 insertions, 0 deletions
diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py index 07855fa7..f54a554b 100644 --- a/djangorestframework/runtests/settings.py +++ b/djangorestframework/runtests/settings.py @@ -97,6 +97,14 @@ INSTALLED_APPS = (      'djangorestframework',  ) +STATIC_URL = '/static/' + +import django + +if django.VERSION < (1, 3): +    INSTALLED_APPS += ('staticfiles',) + +  # OAuth support is optional, so we only test oauth if it's installed.  try:      import oauth_provider  | 
