Update for compatibility with Django 1.11

3 files changed, 30 insertions, 29 deletions

diff --git a/pgmailmgr/mailmgr/views.py b/pgmailmgr/mailmgr/views.py
index 95d5cf5..421e067 100644
--- a/pgmailmgr/mailmgr/views.py
+++ b/pgmailmgr/mailmgr/views.py
@@ -1,7 +1,6 @@
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
 from django.contrib.auth.decorators import login_required
-from django.template import RequestContext
 from django.contrib import messages
 from django.db import transaction
 
@@ -20,10 +19,10 @@ def home(request):
 	users = VirtualUser.objects.extra(where=["EXISTS (SELECT 1 FROM mailmgr_userpermissions p WHERE p.user_id=%s AND p.domain_id = local_domain_id AND local_part ~* ('^'||p.pattern||'$'))" % request.user.id])
 	forwards = Forwarder.objects.extra(where=["EXISTS (SELECT 1 FROM mailmgr_userpermissions p WHERE p.user_id=%s AND p.domain_id = local_domain_id AND local_part ~* ('^'||p.pattern||'$'))" % request.user.id])
 
-	return render_to_response('home.html', {
+	return render(request, 'home.html', {
 			'users': users,
 			'forwarders': forwards,
-			}, RequestContext(request))
+			})
 
 @transaction.atomic
 @login_required
@@ -55,10 +54,10 @@ def userform(request, userparam):
 		# Generate a new form
 		form = VirtualUserForm(instance=vu, user=request.user)
 
-	return render_to_response('form.html', {
+	return render(request,'form.html', {
 			'form': form,
 			'savebutton': (userparam == 'new') and "New" or "Save"
-			}, RequestContext(request))
+			})
 
 @transaction.atomic
 @login_required
@@ -82,8 +81,8 @@ def forwarderform(request, userparam):
 		# Generate a new form
 		form = ForwarderForm(instance=fwd, user=request.user)
 
-	return render_to_response('form.html', {
+	return render(request, 'form.html', {
 			'form': form,
 			'savebutton': (userparam == 'new') and "New" or "Save"
-			}, RequestContext(request))
+			})
 
diff --git a/pgmailmgr/settings.py b/pgmailmgr/settings.py
index 49e4421..006cd54 100644
--- a/pgmailmgr/settings.py
+++ b/pgmailmgr/settings.py
@@ -89,13 +89,6 @@ STATICFILES_FINDERS = (
 #SECRET_KEY lives in settings_local.py
 
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -106,11 +99,17 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'pgmailmgr.urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
+TEMPLATES = [{
+	'BACKEND': 'django.template.backends.django.DjangoTemplates',
+	'APP_DIRS': True,
+	'OPTIONS': {
+		'context_processors': [
+			'django.template.context_processors.request',
+			'django.contrib.auth.context_processors.auth',
+			'django.contrib.messages.context_processors.messages',
+		],
+	},
+}]
 
 TEMPLATE_CONTEXT_PROCESSORS = (
 	'django.contrib.auth.context_processors.auth',
diff --git a/pgmailmgr/urls.py b/pgmailmgr/urls.py
index 8a40470..b91efc4 100644
--- a/pgmailmgr/urls.py
+++ b/pgmailmgr/urls.py
@@ -1,19 +1,22 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
-urlpatterns = patterns('',
-    url(r'^$', 'pgmailmgr.mailmgr.views.home'),
-    url(r'^user/(\d+|add)/$', 'pgmailmgr.mailmgr.views.userform'),
-    url(r'^forwarder/(\d+|add)/$', 'pgmailmgr.mailmgr.views.forwarderform'),
+import pgmailmgr.mailmgr.views as views
+import pgmailmgr.auth
+
+urlpatterns = [
+    url(r'^$', views.home),
+    url(r'^user/(\d+|add)/$', views.userform),
+    url(r'^forwarder/(\d+|add)/$', views.forwarderform),
 
     # Auth
-    url('^auth_receive/$', 'pgmailmgr.auth.auth_receive'),
-    url('^accounts/logout/$', 'pgmailmgr.auth.logout'),
-    url('^accounts/login/$', 'pgmailmgr.auth.login'),
+    url('^auth_receive/$', pgmailmgr.auth.auth_receive),
+    url('^accounts/logout/$', pgmailmgr.auth.logout),
+    url('^accounts/login/$', pgmailmgr.auth.login),
 
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
-)
+]