Removed support for Python 2

Author: claudep

.travis.yml

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

HISTORY.rst

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

django_comments/abstracts.py

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

django_comments/admin.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _, ngettext
@@ -8,7 +6,7 @@
 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
     a mechanism for issuing the equivalent of a .filter(user__username=...)
     search in CommentAdmin.
@@ -43,7 +41,7 @@ class CommentsAdmin(admin.ModelAdmin):
     actions = ["flag_comments", "approve_comments", "remove_comments"]
 
     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.
         if not request.user.is_superuser and 'delete_selected' in actions:
             actions.pop('delete_selected')

django_comments/feeds.py

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

django_comments/forms.py

@@ -30,7 +30,7 @@ def __init__(self, target_object, data=None, initial=None, **kwargs):
         if initial is None:
             initial = {}
         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):
         """Return just those errors associated with security"""

django_comments/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 

django_comments/migrations/0002_update_user_email_field_length.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

django_comments/migrations/0003_add_submit_date_index.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

django_comments/models.py

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