aboutsummaryrefslogtreecommitdiffstats
path: root/examples/settings.py
diff options
context:
space:
mode:
authorMarko Tibold2011-12-30 16:35:22 +0100
committerMarko Tibold2011-12-30 16:35:22 +0100
commitb137b5ee5606a182dab4ff68a29f805b72e81ad3 (patch)
treeff272330f1e1c8924477768436a6d6b49444af4b /examples/settings.py
parent28f1b027aa8b452378a89118b938f24b2383dc9a (diff)
parentb8bfebc83719a7c286fee413bb44fffedac1a8d0 (diff)
downloaddjango-rest-framework-b137b5ee5606a182dab4ff68a29f805b72e81ad3.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'examples/settings.py')
-rw-r--r--examples/settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/settings.py b/examples/settings.py
index 4438bb84..e12b7f3f 100644
--- a/examples/settings.py
+++ b/examples/settings.py
@@ -1,4 +1,5 @@
# Settings for djangorestframework examples project
+import os
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -46,7 +47,7 @@ USE_L10N = True
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/"
# NOTE: Some of the djangorestframework examples use MEDIA_ROOT to store content.
-MEDIA_ROOT = 'media/'
+MEDIA_ROOT = os.path.join(os.getenv('EPIO_DATA_DIRECTORY', '.'), 'media')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).