aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2008-10-12 19:41:01 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2008-10-13 08:17:29 +0530
commit8fb6165ef1b079214aa0c0d29e60a2dcf0c499f2 (patch)
tree646b9d6d6a64271d63f55ca9a2ad7c0f8d05f23c /master/custom/autotua_settings.py
parentUpdate TODO (diff)
downloadautotua-8fb6165ef1b079214aa0c0d29e60a2dcf0c499f2.tar.gz
autotua-8fb6165ef1b079214aa0c0d29e60a2dcf0c499f2.tar.bz2
autotua-8fb6165ef1b079214aa0c0d29e60a2dcf0c499f2.zip
Improve merging of autotua settings in Django
* Instead of doing a circular import on "autotua_settings", manually do a merge from "master.settings" (and any other django apps in the dir) * Entries beginning with '_' and not all UPPERCASE are ignored.
Diffstat (limited to 'master/custom/autotua_settings.py')
-rw-r--r--master/custom/autotua_settings.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/master/custom/autotua_settings.py b/master/custom/autotua_settings.py
deleted file mode 100644
index 7bd2450..0000000
--- a/master/custom/autotua_settings.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import os
-from settings import *
-
-_cwd = os.path.dirname(__file__)
-
-MEDIA_PREFIX = '/site_media/'
-TEMPLATE_DIRS += os.path.join(_cwd, 'master', 'templates').replace('\\', '/'),
-INSTALLED_APPS += ('master',)
-MEDIA_ROOT = os.path.join(_cwd, 'master', 'media').replace('\\', '/')
-LOGIN_URL = '/login'