Going to python3 and Django 1.8!

1 files changed, 17 insertions, 15 deletions

diff --git a/chimere_example_project/settings.py b/chimere_example_project/settings.py
index 8ab1da4..6878def 100644
--- a/chimere_example_project/settings.py
+++ b/chimere_example_project/settings.py
@@ -219,7 +219,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware'
 ]
 
@@ -261,7 +261,6 @@ except ImportError:
     pass
 
 INSTALLED_APPS += [
-    'south',
     'chimere',
 ]
 
@@ -273,8 +272,8 @@ CHIMERE_EDIT_RENDERER = 'openlayers'  # 'openlayers'
 
 try:
     from local_settings import *
-except ImportError, e:
-    print 'Unable to load local_settings.py:', e
+except ImportError as e:
+    print('Unable to load local_settings.py:', e)
 
 if CHIMERE_SEARCH_ENGINE:
     INSTALLED_APPS.insert(INSTALLED_APPS.index('south'), 'haystack')
@@ -361,17 +360,20 @@ if DEBUG_TOOLBAR:
     global DEBUG_TOOLBAR_CONFIG
     MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware']
     INSTALLED_APPS += ['debug_toolbar']
-    DEBUG_TOOLBAR_PANELS = (
-        'debug_toolbar.panels.version.VersionDebugPanel',
-        'debug_toolbar.panels.timer.TimerDebugPanel',
-        'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-        'debug_toolbar.panels.headers.HeaderDebugPanel',
-        'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-        'debug_toolbar.panels.template.TemplateDebugPanel',
-        'debug_toolbar.panels.sql.SQLDebugPanel',
-        'debug_toolbar.panels.signals.SignalDebugPanel',
-        'debug_toolbar.panels.logger.LoggingPanel',
-    )
+    DEBUG_TOOLBAR_PANELS = [
+        'debug_toolbar.panels.versions.VersionsPanel',
+        'debug_toolbar.panels.timer.TimerPanel',
+        'debug_toolbar.panels.settings.SettingsPanel',
+        'debug_toolbar.panels.headers.HeadersPanel',
+        'debug_toolbar.panels.request.RequestPanel',
+        'debug_toolbar.panels.sql.SQLPanel',
+        'debug_toolbar.panels.staticfiles.StaticFilesPanel',
+        'debug_toolbar.panels.templates.TemplatesPanel',
+        'debug_toolbar.panels.cache.CachePanel',
+        'debug_toolbar.panels.signals.SignalsPanel',
+        'debug_toolbar.panels.logging.LoggingPanel',
+        'debug_toolbar.panels.redirects.RedirectsPanel',
+    ]
     DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}