Fix deprecations: Round 1 (#643)

* Remove an unneccesary include * Declare the app name for namespaced-include * Drop django.contrib.webdesign * Correctly hook into template settings
pythonindia · Mar 23, 2020 · 2d9e8bc · 2d9e8bc
1 parent 87c3172
commit 2d9e8bc
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 25 deletions.
diff --git a/junction/profiles/urls.py b/junction/profiles/urls.py
@@ -3,9 +3,9 @@
 
 from . import views
 
+app_name = "junction.profiles"
+
 urlpatterns = [
     url(r'^$', views.dashboard, name='dashboard'),
     url(r'^edit/$', views.profile, name='profile'),
-
-
 ]
diff --git a/junction/templates/pages/home_page.html b/junction/templates/pages/home_page.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
 {% load django_markdown %}
-{% load webdesign %}
 {% load static from staticfiles %}
 
 {% block head_title %}Welcome to {{ SITE_INFO.site_name }}{% endblock %}

diff --git a/junction/templates/static-content/blog-archive.html b/junction/templates/static-content/blog-archive.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Blog Archive</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/templates/static-content/coc.html b/junction/templates/static-content/coc.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Code of Conduct</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/templates/static-content/faq.html b/junction/templates/static-content/faq.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Frequently Asked Questions</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/templates/static-content/schedule.html b/junction/templates/static-content/schedule.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Schedule</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/templates/static-content/speakers.html b/junction/templates/static-content/speakers.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Speakers</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/templates/static-content/sponsors.html b/junction/templates/static-content/sponsors.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Sponsors</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/templates/static-content/venue.html b/junction/templates/static-content/venue.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 
-{% load webdesign %}
 
 {% block head_title %}{{ block.super }}{% endblock %}
 
@@ -10,4 +9,4 @@ <h1>Venue</h1>
 
 {% block content %}
     {% lorem 3 p %}
-{% endblock %}
+{% endblock %}
diff --git a/junction/urls.py b/junction/urls.py
@@ -44,7 +44,7 @@
     url(r'^$', HomePageView.as_view(), name="page-home"),
 
     # Django Admin
-    url(r'^nimda/', include(admin.site.urls)),
+    url(r'^nimda/', admin.site.urls),
 
     # Third Party Stuff
     url(r'^accounts/', include('allauth.urls')),

diff --git a/settings/common.py b/settings/common.py
@@ -57,7 +57,6 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.sites',
-    'django.contrib.webdesign',
 )
 
 THIRD_PARTY_APPS = (

diff --git a/settings/dev.py.sample b/settings/dev.py.sample
@@ -6,7 +6,7 @@ import os
 from .common import *  # noqa
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
 
 DATABASES = {
     'default': {
@@ -17,9 +17,9 @@ DATABASES = {
 
 ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'http'
 
-TEMPLATE_CONTEXT_PROCESSORS += (
+TEMPLATES[0]['OPTIONS']['context_processors'].extend([
     "django.core.context_processors.debug",
-)
+])
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 

diff --git a/settings/test_settings.py b/settings/test_settings.py
@@ -6,7 +6,7 @@
 from .common import *  # noqa
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
 
 DATABASES = {
     'default': {
@@ -15,9 +15,9 @@
     }
 }
 
-TEMPLATE_CONTEXT_PROCESSORS += (
+TEMPLATES[0]['OPTIONS']['context_processors'].extend([
     "django.core.context_processors.debug",
-)
+])
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'