Removed support for Python 2

@@ -2,8 +2,6 @@ dist: xenial
 language: python
 language: python
 matrix:
 matrix:
   include:
   include:
-    - python: 2.7
-      env: TOXENV=py27-django111
     - python: 3.4
     - python: 3.4
       env: TOXENV=py34-django111
       env: TOXENV=py34-django111
     - python: 3.4
     - python: 3.4

@@ -3,6 +3,11 @@
 History
 History
 =======
 =======
 
 
+X.Y.Z (YYYY-MM-DD)
+------------------
+
+* Removed support for Python 2.
+
 1.9.2 (2019-12-03)
 1.9.2 (2019-12-03)
 ------------------
 ------------------
 
 

-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
@@ -8,7 +6,6 @@ from django.db import models
 from django.urls import reverse
 from django.urls import reverse
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import gettext_lazy as _
-from six import python_2_unicode_compatible
 
 
 from .managers import CommentManager
 from .managers import CommentManager
 
 
@@ -45,7 +42,6 @@ class BaseCommentAbstractModel(models.Model):
         )
         )
 
 
 
 
-@python_2_unicode_compatible
 class CommentAbstractModel(BaseCommentAbstractModel):
 class CommentAbstractModel(BaseCommentAbstractModel):
     """
     """
     A user comment about some object.
     A user comment about some object.
@@ -90,7 +86,7 @@ class CommentAbstractModel(BaseCommentAbstractModel):
     def save(self, *args, **kwargs):
     def save(self, *args, **kwargs):
         if self.submit_date is None:
         if self.submit_date is None:
             self.submit_date = timezone.now()
             self.submit_date = timezone.now()
-        super(CommentAbstractModel, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
 
     def _get_userinfo(self):
     def _get_userinfo(self):
         """
         """

-from __future__ import unicode_literals
-
 from django.contrib import admin
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _, ngettext
 from django.utils.translation import gettext_lazy as _, ngettext
@@ -8,7 +6,7 @@ from django_comments import get_model
 from django_comments.views.moderation import perform_flag, perform_approve, perform_delete
 from django_comments.views.moderation import perform_flag, perform_approve, perform_delete
 
 
 
 
-class UsernameSearch(object):
+class UsernameSearch:
     """The User object may not be auth.User, so we need to provide
     """The User object may not be auth.User, so we need to provide
     a mechanism for issuing the equivalent of a .filter(user__username=...)
     a mechanism for issuing the equivalent of a .filter(user__username=...)
     search in CommentAdmin.
     search in CommentAdmin.
@@ -43,7 +41,7 @@ class CommentsAdmin(admin.ModelAdmin):
     actions = ["flag_comments", "approve_comments", "remove_comments"]
     actions = ["flag_comments", "approve_comments", "remove_comments"]
 
 
     def get_actions(self, request):
     def get_actions(self, request):
-        actions = super(CommentsAdmin, self).get_actions(request)
+        actions = super().get_actions(request)
         # Only superusers should be able to delete the comments from the DB.
         # Only superusers should be able to delete the comments from the DB.
         if not request.user.is_superuser and 'delete_selected' in actions:
         if not request.user.is_superuser and 'delete_selected' in actions:
             actions.pop('delete_selected')
             actions.pop('delete_selected')

@@ -10,7 +10,7 @@ class LatestCommentFeed(Feed):
 
 
     def __call__(self, request, *args, **kwargs):
     def __call__(self, request, *args, **kwargs):
         self.site = get_current_site(request)
         self.site = get_current_site(request)
-        return super(LatestCommentFeed, self).__call__(request, *args, **kwargs)
+        return super().__call__(request, *args, **kwargs)
 
 
     def title(self):
     def title(self):
         return _("%(site_name)s comments") % dict(site_name=self.site.name)
         return _("%(site_name)s comments") % dict(site_name=self.site.name)

@@ -30,7 +30,7 @@ class CommentSecurityForm(forms.Form):
         if initial is None:
         if initial is None:
             initial = {}
             initial = {}
         initial.update(self.generate_security_data())
         initial.update(self.generate_security_data())
-        super(CommentSecurityForm, self).__init__(data=data, initial=initial, **kwargs)
+        super().__init__(data=data, initial=initial, **kwargs)
 
 
     def security_errors(self):
     def security_errors(self):
         """Return just those errors associated with security"""
         """Return just those errors associated with security"""

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.db import models, migrations
 from django.conf import settings
 from django.conf import settings
 
 

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.db import models, migrations
 
 
 
 

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.db import models, migrations
 
 
 
 

@@ -2,7 +2,6 @@ from django.conf import settings
 from django.db import models
 from django.db import models
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import gettext_lazy as _
-from six import python_2_unicode_compatible
 
 
 from .abstracts import (
 from .abstracts import (
     COMMENT_MAX_LENGTH, BaseCommentAbstractModel, CommentAbstractModel,
     COMMENT_MAX_LENGTH, BaseCommentAbstractModel, CommentAbstractModel,
@@ -14,7 +13,6 @@ class Comment(CommentAbstractModel):
         db_table = "django_comments"
         db_table = "django_comments"
 
 
 
 
-@python_2_unicode_compatible
 class CommentFlag(models.Model):
 class CommentFlag(models.Model):
     """
     """
     Records a flag on a comment. This is intentionally flexible; right now, a
     Records a flag on a comment. This is intentionally flexible; right now, a
@@ -59,4 +57,4 @@ class CommentFlag(models.Model):
     def save(self, *args, **kwargs):
     def save(self, *args, **kwargs):
         if self.flag_date is None:
         if self.flag_date is None:
             self.flag_date = timezone.now()
             self.flag_date = timezone.now()
-        super(CommentFlag, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

@@ -86,7 +86,7 @@ class NotModerated(Exception):
     pass
     pass
 
 
 
 
-class CommentModerator(object):
+class CommentModerator:
     """
     """
     Encapsulates comment-moderation options for a given model.
     Encapsulates comment-moderation options for a given model.
 
 
@@ -257,7 +257,7 @@ class CommentModerator(object):
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
 
 
 
 
-class Moderator(object):
+class Moderator:
     """
     """
     Handles moderation of a set of models.
     Handles moderation of a set of models.
 
 

-from __future__ import absolute_import
-
 from django import http
 from django import http
 from django.apps import apps
 from django.apps import apps
 from django.conf import settings
 from django.conf import settings
@@ -24,7 +22,7 @@ class CommentPostBadRequest(http.HttpResponseBadRequest):
     """
     """
 
 
     def __init__(self, why):
     def __init__(self, why):
-        super(CommentPostBadRequest, self).__init__()
+        super().__init__()
         if settings.DEBUG:
         if settings.DEBUG:
             self.content = render_to_string("comments/400-debug.html", {"why": why})
             self.content = render_to_string("comments/400-debug.html", {"why": why})
 
 

-from __future__ import absolute_import
-
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.sites.shortcuts import get_current_site
 from django.contrib.sites.shortcuts import get_current_site
 from django.shortcuts import get_object_or_404, render
 from django.shortcuts import get_object_or_404, render

@@ -3,11 +3,7 @@ A few bits of helper functions for comment views.
 """
 """
 
 
 import textwrap
 import textwrap
-
-try:
-    from urllib.parse import urlencode
-except ImportError:  # Python 2
-    from urllib import urlencode
+from urllib.parse import urlencode
 
 
 from django.http import HttpResponseRedirect
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, resolve_url
 from django.shortcuts import render, resolve_url

@@ -87,7 +87,7 @@ field::
 
 
         def get_comment_create_data(self, **kwargs):
         def get_comment_create_data(self, **kwargs):
             # Use the data of the superclass, and add in the title field
             # Use the data of the superclass, and add in the title field
-            data = super(CommentFormWithTitle, self).get_comment_create_data(**kwargs)
+            data = super().get_comment_create_data(**kwargs)
             data['title'] = self.cleaned_data['title']
             data['title'] = self.cleaned_data['title']
             return data
             return data
 
 

@@ -33,7 +33,6 @@ setup(
         'License :: OSI Approved :: BSD License',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.7',

@@ -3,13 +3,9 @@ Comments may be attached to any object. See the comment documentation for
 more information.
 more information.
 """
 """
 
 
-from __future__ import unicode_literals
-
 from django.db import models
 from django.db import models
-from six import python_2_unicode_compatible
 
 
 
 
-@python_2_unicode_compatible
 class Author(models.Model):
 class Author(models.Model):
     first_name = models.CharField(max_length=30)
     first_name = models.CharField(max_length=30)
     last_name = models.CharField(max_length=30)
     last_name = models.CharField(max_length=30)
@@ -18,7 +14,6 @@ class Author(models.Model):
         return '%s %s' % (self.first_name, self.last_name)
         return '%s %s' % (self.first_name, self.last_name)
 
 
 
 
-@python_2_unicode_compatible
 class Article(models.Model):
 class Article(models.Model):
     author = models.ForeignKey(Author, on_delete=models.CASCADE)
     author = models.ForeignKey(Author, on_delete=models.CASCADE)
     headline = models.CharField(max_length=100)
     headline = models.CharField(max_length=100)
@@ -27,7 +22,6 @@ class Article(models.Model):
         return self.headline
         return self.headline
 
 
 
 
-@python_2_unicode_compatible
 class Entry(models.Model):
 class Entry(models.Model):
     title = models.CharField(max_length=250)
     title = models.CharField(max_length=250)
     body = models.TextField()
     body = models.TextField()

-from __future__ import absolute_import
-
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site

-from __future__ import absolute_import
-
 from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ImproperlyConfigured
 from django.test.utils import modify_settings, override_settings
 from django.test.utils import modify_settings, override_settings
 
 

-from __future__ import absolute_import
-
 import time
 import time
 
 
 from django.conf import settings
 from django.conf import settings
@@ -15,7 +13,7 @@ from testapp.models import Article
 class CommentFormTests(CommentTestCase):
 class CommentFormTests(CommentTestCase):
 
 
     def setUp(self):
     def setUp(self):
-        super(CommentFormTests, self).setUp()
+        super().setUp()
         self.site_2 = Site.objects.create(id=settings.SITE_ID + 1,
         self.site_2 = Site.objects.create(id=settings.SITE_ID + 1,
             domain="testserver", name="testserver")
             domain="testserver", name="testserver")
 
 

-from __future__ import absolute_import
-
 from django.core import mail
 from django.core import mail
 from django.test.utils import override_settings
 from django.test.utils import override_settings
 
 

-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 
 

-from __future__ import absolute_import
-
 from xml.etree import ElementTree as ET
 from xml.etree import ElementTree as ET
 
 
 from django.conf import settings
 from django.conf import settings

-from __future__ import absolute_import
-
 from django_comments.models import Comment
 from django_comments.models import Comment
 
 
 from . import CommentTestCase
 from . import CommentTestCase

-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth.models import User, Permission
 from django.contrib.auth.models import User, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.test.utils import override_settings
 from django.test.utils import override_settings
@@ -268,7 +266,7 @@ class ApproveViewTests(CommentTestCase):
 class AdminActionsTests(CommentTestCase):
 class AdminActionsTests(CommentTestCase):
 
 
     def setUp(self):
     def setUp(self):
-        super(AdminActionsTests, self).setUp()
+        super().setUp()
 
 
         # Make "normaluser" a moderator
         # Make "normaluser" a moderator
         u = User.objects.get(username="normaluser")
         u = User.objects.get(username="normaluser")

-from __future__ import absolute_import
-
 from django.conf import settings
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site
@@ -17,7 +15,7 @@ from . import CommentTestCase
 class CommentTemplateTagTests(CommentTestCase):
 class CommentTemplateTagTests(CommentTestCase):
 
 
     def setUp(self):
     def setUp(self):
-        super(CommentTemplateTagTests, self).setUp()
+        super().setUp()
         self.site_2 = Site.objects.create(id=settings.SITE_ID + 1,
         self.site_2 = Site.objects.create(id=settings.SITE_ID + 1,
             domain="testserver", name="testserver")
             domain="testserver", name="testserver")
 
 

-from __future__ import absolute_import
-
 from django.conf.urls import url
 from django.conf.urls import url
 from django.contrib.contenttypes.views import shortcut
 from django.contrib.contenttypes.views import shortcut
 
 

 [tox]
 [tox]
 envlist =
 envlist =
-    py{27,34,35,36,37}-django111
+    py{34,35,36,37}-django111
     py3{4,5,6,7}-django20
     py3{4,5,6,7}-django20
     py3{5,6,7}-django21
     py3{5,6,7}-django21
     py3{5,6,7}-django22
     py3{5,6,7}-django22
@@ -9,7 +9,6 @@ envlist =
 
 
 [testenv]
 [testenv]
 basepython =
 basepython =
-    py27: python2.7
     py34: python3.4
     py34: python3.4
     py35: python3.5
     py35: python3.5
     py36: python3.6
     py36: python3.6