diff options
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/settings.py b/settings.py index 9a97387..58b930d 100644 --- a/settings.py +++ b/settings.py @@ -1,8 +1,22 @@ -from localsettings import * #inital localsettings call so that urljoins work import os -import urlparse + +import urllib.parse + import django +from localsettings import * + #inital localsettings call so that urljoins work + +#Imports should be grouped in the following order: + +#Standard library imports. +#Related third party imports. +#Local application/library specific imports. +#You should put a blank line between each group of imports. + +print("** importing settings.py") +print("--**-- REPOS_ROOT_PATH: ", REPOS_ROOT_PATH) + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -10,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__)) DEBUG = True TEMPLATE_DEBUG = DEBUG -ALLOWED_HOSTS = [u'expo.survex.com'] +ALLOWED_HOSTS = ['expo.survex.com'] ADMINS = ( # ('Your Name', 'your_email@domain.com'), @@ -48,10 +62,10 @@ ADMIN_MEDIA_PREFIX = '/troggle/media-admin/' CAVEDESCRIPTIONS = os.path.join(EXPOWEB, "cave_data") ENTRANCEDESCRIPTIONS = os.path.join(EXPOWEB, "entrance_data") -MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/') -SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/') -PHOTOS_URL = urlparse.urljoin(URL_ROOT , '/photos/') -SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/') +MEDIA_URL = urllib.parse.urljoin(URL_ROOT , '/site_media/') +SURVEYS_URL = urllib.parse.urljoin(URL_ROOT , '/survey_scans/') +PHOTOS_URL = urllib.parse.urljoin(URL_ROOT , '/photos/') +SVX_URL = urllib.parse.urljoin(URL_ROOT , '/survex/') # top-level survex file basename (without .svx) SURVEX_TOPNAME = "1623" @@ -169,5 +183,5 @@ TINYMCE_COMPRESSOR = True MAX_LOGBOOK_ENTRY_TITLE_LENGTH = 200 TEST_RUNNER = 'django.test.runner.DiscoverRunner' - -from localsettings import * #localsettings needs to take precedence. Call it to override any existing vars. +from localsettings import * +#localsettings needs to take precedence. Call it to override any existing vars. |