Clean install with python3

1 files changed, 26 insertions, 52 deletions

diff --git a/settings.py b/settings.py
index 48e1d20..7002715 100644
--- a/settings.py
+++ b/settings.py
@@ -1,20 +1,28 @@
-import os
+"""
+Django settings for troggle project.
 
-import urllib.parse
+For more information on this file, see
+https://docs.djangoproject.com/en/1.7/topics/settings/
 
-import django
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.7/ref/settings/
+"""
+#Imports should be grouped in the following order:
 
-print("** importing settings.py")
-from localsettings import *
- #inital localsettings call so that urljoins work
+#1.Standard library imports.
+#2.Related third party imports.
+#3.Local application/library specific imports.
+#4.You should put a blank line between each group of imports.
 
-#Imports should be grouped in the following order:
+import os
+import urllib.parse
 
-#Standard library imports.
-#Related third party imports.
-#Local application/library specific imports.
-#You should put a blank line between each group of imports.
+import django
 
+# Note that this builds upon the django system installed
+# global settings in
+# django/conf/global_settings.py which is automatically loaded first.
+# read https://docs.djangoproject.com/en/3.0/topics/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
@@ -28,7 +36,6 @@ ALLOWED_HOSTS = ['expo.survex.com']
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
-
 MANAGERS = ADMINS
 
 # Local time zone for this installation. Choices can be found here:
@@ -51,37 +58,14 @@ USE_I18N = True
 USE_L10N = True
 
 FIX_PERMISSIONS = []
-NOTABLECAVESHREFS = [ "161", "204", "258", "76", "107", "264" ]
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
-#PHOTOS_ROOT = os.path.join(EXPOWEB, 'mugshot-data')
-CAVEDESCRIPTIONS = os.path.join(EXPOWEB, "cave_data")
-ENTRANCEDESCRIPTIONS = os.path.join(EXPOWEB, "entrance_data")
-
-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"
 
 DEFAULT_LOGBOOK_PARSER = "Parseloghtmltxt"
 DEFAULT_LOGBOOK_FILE = "logbook.html"
-
+# All years since 2010 use the default value for Logbook parser
 LOGBOOK_PARSER_SETTINGS = {
-                "2019": ("2019/logbook.html", "Parseloghtmltxt"),
-                "2018": ("2018/logbook.html", "Parseloghtmltxt"),
-                "2017": ("2017/logbook.html", "Parseloghtmltxt"),
-                "2016": ("2016/logbook.html", "Parseloghtmltxt"),
-                "2015": ("2015/logbook.html", "Parseloghtmltxt"),
-                "2014": ("2014/logbook.html", "Parseloghtmltxt"), 
-                "2013": ("2013/logbook.html", "Parseloghtmltxt"), 
-                "2012": ("2012/logbook.html", "Parseloghtmltxt"), 
-                "2011": ("2011/logbook.html", "Parseloghtmltxt"), 
                 "2010": ("2010/logbook.html", "Parseloghtmltxt"), 
                 "2009": ("2009/2009logbook.txt", "Parselogwikitxt"), 
                 "2008": ("2008/2008logbook.txt", "Parselogwikitxt"), 
@@ -99,9 +83,9 @@ LOGBOOK_PARSER_SETTINGS = {
                 "1996": ("1996/log.htm", "Parseloghtml01"),
                 "1995": ("1995/log.htm", "Parseloghtml01"), 
                 "1994": ("1994/log.htm", "Parseloghtml01"), 
-                "1993": ("1993/log.htm", "Parseloghtml01"), 		
-                "1992": ("1992/log.htm", "Parseloghtml01"), 		
-                "1991": ("1991/log.htm", "Parseloghtml01"), 		
+                "1993": ("1993/log.htm", "Parseloghtml01"), 
+                "1992": ("1992/log.htm", "Parseloghtml01"), 
+                "1991": ("1991/log.htm", "Parseloghtml01"), 
             }
 
 APPEND_SLASH = False
@@ -114,14 +98,9 @@ SECRET_KEY = 'a#vaeozn0)uz_9t_%v5n#tj)m+%ace6b_0(^fj!355qki*v)j2'
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#   'django.template.loaders.eggs.load_template_source',
 )
 
-if django.VERSION[0] == 1 and django.VERSION[1] < 4:
-    authmodule = 'django.core.context_processors.auth'
-else:
-    authmodule = 'django.contrib.auth.context_processors.auth'
-
+authmodule = 'django.contrib.auth.context_processors.auth'
 TEMPLATE_CONTEXT_PROCESSORS = ( authmodule, "core.context.troggle_context", ) 
 
 LOGIN_REDIRECT_URL = '/'
@@ -135,15 +114,11 @@ INSTALLED_APPS = (
     'django.contrib.redirects',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    #'troggle.photologue',
-    #'troggle.reversion',
-    #'django_evolution',
     'tinymce',
     'registration',
     'troggle.profiles',
     'troggle.core',
     'troggle.flatpages',
-    #'troggle.imagekit', 
 )
 
 MIDDLEWARE_CLASSES = (
@@ -168,9 +143,6 @@ AUTH_PROFILE_MODULE = 'core.person'
 
 QM_PATTERN="\[\[\s*[Qq][Mm]:([ABC]?)(\d{4})-(\d*)-(\d*)\]\]"
 
-TINYMCE_JS_URL = 'http://debug.example.org/tiny_mce/tiny_mce_src.js'
-
-#TINYMCE_JS_URL = os.path.join(MEDIA_URL, "tinybibble_mce.js")
 
 TINYMCE_DEFAULT_CONFIG = {
     'plugins': "table,spellchecker,paste,searchreplace",
@@ -182,5 +154,7 @@ 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.