DIV-889: Update to 1.10

edivorce/apps/core/templatetags/step_order.py

@@ -1,7 +1,7 @@
 from django import template
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from ..utils.template_step_order import template_step_order, template_sub_step_order, get_step_name, \
     get_step_or_sub_step_name

edivorce/apps/core/templatetags/summary_format.py

@@ -3,7 +3,7 @@ from collections import OrderedDict
 from django import template
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.html import format_html, format_html_join
 
 register = template.Library()

edivorce/apps/core/urls.py

@@ -2,9 +2,6 @@ from django.conf.urls import url
 
 from .views import main, system, pdf, api, localdev
 
-handler404 = 'core.views.main.page_not_found'
-handler500 = 'core.views.main.server_error'
-
 urlpatterns = [
     # url(r'^guide$', styleguide.guide),
     url(r'^api/response$', api.UserResponseHandler.as_view()),

edivorce/apps/core/utils/step_completeness.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from edivorce.apps.core.models import Question
 from edivorce.apps.core.utils.question_step_mapping import question_step_mapping, pre_qual_step_question_mapping

edivorce/apps/core/views/main.py

@@ -1,7 +1,7 @@
 import datetime
 
 from django.conf import settings
-from django.shortcuts import render, redirect, render_to_response
+from django.shortcuts import render, redirect
 from django.utils import timezone
 from django.template import RequestContext
 
@@ -204,20 +204,14 @@ def page_not_found(request):
     """
     404 Error Page
     """
-    response = render_to_response('404.html', {},
-                                  context_instance=RequestContext(request))
-    response.status_code = 404
-    return response
+    return render(request, '404.html', status=404)
 
 
 def server_error(request):
     """
     500 Error Page
     """
-    response = render_to_response('500.html', {},
-                                  context_instance=RequestContext(request))
-    response.status_code = 500
-    return response
+    return render(request, '500.html', status=500)
 
 
 def legal(request):

edivorce/apps/core/views/system.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.http import HttpResponse, Http404
 from django.shortcuts import render, redirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from edivorce.apps.core.models import Question
 

edivorce/settings/base.py

@@ -56,7 +56,6 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'edivorce.apps.core.middleware.bceid_middleware.BceidMiddleware',
@@ -144,3 +143,5 @@ DEBUG_TOOLBAR_CONFIG = {
 }
 
 SECURE_BROWSER_XSS_FILTER = True
+
+LOGOUT_URL = '/accounts/logout/'

edivorce/settings/local.py

@@ -25,3 +25,5 @@ PROXY_BASE_URL = ''
 SASS_PROCESSOR_ENABLED = True
 SASS_PROCESSOR_ROOT = PROJECT_ROOT + '/edivorce/apps/core/static'
 SASS_OUTPUT_STYLE = 'compressed'
+
+LOGOUT_URL = '/accounts/logout/'

edivorce/urls.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
+from .apps.core.views import main
 
 urlpatterns = []
 
@@ -12,3 +13,6 @@ if settings.ENVIRONMENT in ['localdev', 'minishift']:
     urlpatterns.append(url(r'^admin/', admin.site.urls))
 
 urlpatterns.append(url(r'^', include('edivorce.apps.core.urls')))
+
+handler404 = main.page_not_found
+handler500 = main.server_error

requirements.txt

@@ -1,4 +1,4 @@
-Django<1.9
+Django<1.11
 django-compressor==2.1
 django-crispy-forms==1.6.1
 django-debug-toolbar==1.9

wsgi.py

@@ -15,6 +15,7 @@ from django.core.management import execute_from_command_line
 # check if the app is running on OpenShift
 if not os.environ.get('OPENSHIFT_BUILD_NAMESPACE', False):
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edivorce.settings.local")
+    is_local = True
 else:
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edivorce.settings.openshift")
 
@@ -32,6 +33,7 @@ if platform_name == "Windows":
     question_fixture_path = os.path.realpath("./edivorce/fixtures/Question.json")
 
 # load the Question fixture
-execute_from_command_line(['manage.py', 'loaddata', question_fixture_path])
+if not is_local:
+	execute_from_command_line(['manage.py', 'loaddata', question_fixture_path])
 
 application = get_wsgi_application()