aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/runtests/settings.py
diff options
context:
space:
mode:
authorSébastien Piquemal2012-01-31 23:21:55 +0200
committerSébastien Piquemal2012-01-31 23:21:55 +0200
commit279fa0d371b73974b87267edabe2a4f76a198ebb (patch)
tree28b3a7aa6d489ad1e93acb14c3e890c8733f85cf /djangorestframework/runtests/settings.py
parent152c385f4de37558fe4e522abad5b97f0cf7ddce (diff)
parentb2fcfffb3bdaed89d39ee563c58dc0ede5e857ac (diff)
downloaddjango-rest-framework-279fa0d371b73974b87267edabe2a4f76a198ebb.tar.bz2
merge
Diffstat (limited to 'djangorestframework/runtests/settings.py')
-rw-r--r--djangorestframework/runtests/settings.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py
index 07855fa7..25f77111 100644
--- a/djangorestframework/runtests/settings.py
+++ b/djangorestframework/runtests/settings.py
@@ -97,6 +97,12 @@ INSTALLED_APPS = (
'djangorestframework',
)
+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