From 41c85e05a1aab8be0e145b7025156fab9e01b0f6 Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Mon, 27 Aug 2018 14:04:41 +0200
Subject: [PATCH] Remove old Django compat code from example app

---
 examples/core/models.py                    |  6 +-----
 examples/core/templates/comments/base.html |  2 +-
 examples/example/settings.py               |  6 +-----
 examples/example/urls.py                   | 14 +++-----------
 examples/requirements.txt                  |  4 ++--
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/examples/core/models.py b/examples/core/models.py
index 4d1fa3c..8878085 100644
--- a/examples/core/models.py
+++ b/examples/core/models.py
@@ -1,9 +1,5 @@
 from django.db import models
-
-try:
-    from django.urls import reverse  # Django 1.10+
-except ImportError:
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class Message(models.Model):
diff --git a/examples/core/templates/comments/base.html b/examples/core/templates/comments/base.html
index 03f5c18..ff45c4d 100644
--- a/examples/core/templates/comments/base.html
+++ b/examples/core/templates/comments/base.html
@@ -1,7 +1,7 @@
 {% extends "core/base.html" %}{% load i18n %}
 {% comment %}
 
-  To implement django.contrib.comments in your web site,
+  To implement django comments in your web site,
   it is recommended to override the following templates in your app:
 
      comments/base.html    - map the blocks 'title' and 'contents' to your base template.
diff --git a/examples/example/settings.py b/examples/example/settings.py
index 7ea2f57..e9532fe 100644
--- a/examples/example/settings.py
+++ b/examples/example/settings.py
@@ -108,17 +108,13 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
+    'django_comments',
 
     # Messages setup:
     'core',
     'threadedcomments',
 )
 
-if django.VERSION >= (1, 8):
-    INSTALLED_APPS += ('django_comments',)
-else:
-    INSTALLED_APPS += ('django.contrib.comments',)
-
 
 # --- App settings
 
diff --git a/examples/example/urls.py b/examples/example/urls.py
index 4d959ee..61e47d6 100644
--- a/examples/example/urls.py
+++ b/examples/example/urls.py
@@ -1,20 +1,12 @@
+import django_comments.urls
 from django.conf import settings
 from django.conf.urls import url, include
 from django.contrib import admin
 from core import views
 
-if 'django_comments' in settings.INSTALLED_APPS:
-    # Django 1.7/1.8 situation
-    import django_comments.urls
-    COMMENT_URLS = django_comments.urls
-else:
-    # Old Django projects
-    import django.contrib.comments.urls
-    COMMENT_URLS = django.contrib.comments.urls
-
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^comments/', include(COMMENT_URLS)),
+    url(r'^admin/', admin.site.urls),
+    url(r'^comments/', include(django_comments.urls)),
 
     url(r'^$', views.home, name='homepage'),
     url(r'^message/(?P<id>.+)$', views.message, name='message_detail'),
diff --git a/examples/requirements.txt b/examples/requirements.txt
index 57f9383..73a277f 100644
--- a/examples/requirements.txt
+++ b/examples/requirements.txt
@@ -1,2 +1,2 @@
-Django >= 1.8
-django-contrib-comments >= 1.7.3
+Django >= 1.11
+django-contrib-comments >= 1.9.0