Prevented django.utils.translation/encoding.* deprecation warnings.

@@ -7,7 +7,7 @@ from django.contrib.sites.models import Site
 from django.db import models
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from six import python_2_unicode_compatible
 
 from .managers import CommentManager

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.contrib import admin
 from django.contrib.auth import get_user_model
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import gettext_lazy as _, ngettext
 
 from django_comments import get_model
 from django_comments.views.moderation import perform_flag, perform_approve, perform_delete
@@ -56,19 +56,19 @@ class CommentsAdmin(admin.ModelAdmin):
 
     def flag_comments(self, request, queryset):
         self._bulk_flag(request, queryset, perform_flag,
-                        lambda n: ungettext('flagged', 'flagged', n))
+                        lambda n: ngettext('flagged', 'flagged', n))
 
     flag_comments.short_description = _("Flag selected comments")
 
     def approve_comments(self, request, queryset):
         self._bulk_flag(request, queryset, perform_approve,
-                        lambda n: ungettext('approved', 'approved', n))
+                        lambda n: ngettext('approved', 'approved', n))
 
     approve_comments.short_description = _("Approve selected comments")
 
     def remove_comments(self, request, queryset):
         self._bulk_flag(request, queryset, perform_delete,
-                        lambda n: ungettext('removed', 'removed', n))
+                        lambda n: ngettext('removed', 'removed', n))
 
     remove_comments.short_description = _("Remove selected comments")
 
@@ -82,7 +82,7 @@ class CommentsAdmin(admin.ModelAdmin):
             action(request, comment)
             n_comments += 1
 
-        msg = ungettext('%(count)s comment was successfully %(action)s.',
+        msg = ngettext('%(count)s comment was successfully %(action)s.',
                         '%(count)s comments were successfully %(action)s.',
                         n_comments)
         self.message_user(request, msg % {'count': n_comments, 'action': done_message(n_comments)})

 from django.contrib.sites.shortcuts import get_current_site
 from django.contrib.syndication.views import Feed
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import django_comments
 

@@ -5,10 +5,10 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.forms.utils import ErrorDict
 from django.utils.crypto import salted_hmac, constant_time_compare
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.text import get_text_list
 from django.utils import timezone
-from django.utils.translation import pgettext_lazy, ungettext, ugettext, ugettext_lazy as _
+from django.utils.translation import pgettext_lazy, ngettext, gettext, gettext_lazy as _
 
 from . import get_model
 
@@ -139,7 +139,7 @@ class CommentDetailsForm(CommentSecurityForm):
         """
         return dict(
             content_type=ContentType.objects.get_for_model(self.target_object),
-            object_pk=force_text(self.target_object._get_pk_val()),
+            object_pk=force_str(self.target_object._get_pk_val()),
             user_name=self.cleaned_data["name"],
             user_email=self.cleaned_data["email"],
             user_url=self.cleaned_data["url"],
@@ -180,12 +180,12 @@ class CommentDetailsForm(CommentSecurityForm):
                 getattr(settings, 'PROFANITIES_LIST', False)):
             bad_words = [w for w in settings.PROFANITIES_LIST if w in comment.lower()]
             if bad_words:
-                raise forms.ValidationError(ungettext(
+                raise forms.ValidationError(ngettext(
                     "Watch your mouth! The word %s is not allowed here.",
                     "Watch your mouth! The words %s are not allowed here.",
                     len(bad_words)) % get_text_list(
                     ['"%s%s%s"' % (i[0], '-' * (len(i) - 2), i[-1])
-                     for i in bad_words], ugettext('and')))
+                     for i in bad_words], gettext('and')))
         return comment
 
 

 from django.db import models
 from django.contrib.contenttypes.models import ContentType
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 
 class CommentManager(models.Manager):
@@ -18,5 +18,5 @@ class CommentManager(models.Manager):
         ct = ContentType.objects.get_for_model(model)
         qs = self.get_queryset().filter(content_type=ct)
         if isinstance(model, models.Model):
-            qs = qs.filter(object_pk=force_text(model._get_pk_val()))
+            qs = qs.filter(object_pk=force_str(model._get_pk_val()))
         return qs

 from django.conf import settings
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from six import python_2_unicode_compatible
 
 from .abstracts import (

@@ -62,7 +62,7 @@ from django.core.mail import send_mail
 from django.db.models.base import ModelBase
 from django.template import loader
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import django_comments
 from django_comments import signals

@@ -3,7 +3,7 @@ from django.template.loader import render_to_string
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.shortcuts import get_current_site
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 import django_comments
 
@@ -85,7 +85,7 @@ class BaseCommentNode(template.Node):
 
         qs = self.comment_model.objects.filter(
             content_type=ctype,
-            object_pk=smart_text(object_pk),
+            object_pk=smart_str(object_pk),
             site__pk=site_id,
         )