Going to python3 and Django 1.8!

4 files changed, 36 insertions, 35 deletions

diff --git a/chimere_example_project/local_settings.py.gitlab-ci b/chimere_example_project/local_settings.py.gitlab-ci
index 9ad355a..5abd801 100644
--- a/chimere_example_project/local_settings.py.gitlab-ci
+++ b/chimere_example_project/local_settings.py.gitlab-ci
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+SECRET_KEY = "Not so secret..."
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
diff --git a/chimere_example_project/manage.py b/chimere_example_project/manage.py
index 20f85bc..504c115 100755
--- a/chimere_example_project/manage.py
+++ b/chimere_example_project/manage.py
@@ -1,17 +1,13 @@
-#!/usr/bin/env python
-import os, sys
-from django.core.management import execute_manager
-sys.path.insert(0, os.path.abspath('./..'))
+#!/usr/bin/env python3
+
+import os
+import sys
 
-try:
-    import settings # Assumed to be in the same directory.
-    if settings.DEBUG:
-        sys.path.insert(0, os.path.abspath('./../chimere'))
-        sys.path.insert(0, os.path.abspath('./../../geo-django-fla/'))
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    sys.path.insert(0, os.path.abspath('./../'))
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
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}
 
 
diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py
index fff1366..155696a 100644
--- a/chimere_example_project/urls.py
+++ b/chimere_example_project/urls.py
@@ -18,27 +18,28 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 admin.autodiscover()
-urlpatterns = patterns('django.views.static',
+urlpatterns = patterns(
+    'django.views.static',
     (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
      {'document_root': settings.MEDIA_ROOT}),
 )
 
 if "tinymce" in settings.INSTALLED_APPS:
-    urlpatterns += patterns('django.views.static',
+    urlpatterns += patterns(
+        'django.views.static',
         (r'^tinymce/', include('tinymce.urls')),)
 
 urlpatterns += staticfiles_urlpatterns()
 
-urlpatterns += patterns('',
+urlpatterns += patterns(
+    '',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
     url(r'^', include('chimere.urls', namespace="chimere")),
 )
-
-