Remove python2 integration layer, make the code works, reduce warnings

zinnia/admin/category.py

@@ -2,7 +2,7 @@
 from django.contrib import admin
 from django.urls import NoReverseMatch
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from zinnia.admin.forms import CategoryAdminForm
 

zinnia/admin/entry.py

@@ -10,8 +10,8 @@
 from django.utils.html import conditional_escape
 from django.utils.html import format_html
 from django.utils.html import format_html_join
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from zinnia import settings
 from zinnia.admin.filters import AuthorListFilter
@@ -87,7 +87,7 @@ def get_title(self, entry):
                              entry.pingback_count +
                              entry.trackback_count)
         if reaction_count:
-            return ungettext_lazy(
+            return ngettext_lazy(
                 '%(title)s (%(reactions)i reaction)',
                 '%(title)s (%(reactions)i reactions)', reaction_count) % \
                 {'title': title,

zinnia/admin/fields.py

@@ -1,6 +1,6 @@
 """Fields for Zinnia admin"""
 from django import forms
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 
 class MPTTModelChoiceIterator(forms.models.ModelChoiceIterator):
@@ -33,7 +33,7 @@ def label_from_instance(self, obj):
         Create labels which represent the tree level of each node
         when generating option labels.
         """
-        label = smart_text(obj)
+        label = smart_str(obj)
         prefix = self.level_indicator * getattr(obj, obj._mptt_meta.level_attr)
         if prefix:
             return '%s %s' % (prefix, label)

zinnia/admin/filters.py

@@ -1,9 +1,9 @@
 """Filters for Zinnia admin"""
 from django.contrib.admin import SimpleListFilter
 from django.db.models import Count
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.encoding import smart_str
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from zinnia.models.author import Author
 from zinnia.models.category import Category
@@ -25,11 +25,11 @@ def lookups(self, request, model_admin):
             '-count_entries_published', '-pk')
         for active_object in active_objects:
             yield (
-                str(active_object.pk), ungettext_lazy(
+                str(active_object.pk), ngettext_lazy(
                     '%(item)s (%(count)i entry)',
                     '%(item)s (%(count)i entries)',
                     active_object.count_entries_published) % {
-                    'item': smart_text(active_object),
+                    'item': smart_str(active_object),
                     'count': active_object.count_entries_published})
 
     def queryset(self, request, queryset):

zinnia/admin/forms.py

@@ -1,7 +1,7 @@
 """Forms for Zinnia admin"""
 from django import forms
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from mptt.forms import TreeNodeChoiceField
 

zinnia/admin/widgets.py

@@ -5,7 +5,7 @@
 from django.contrib.admin import widgets
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.forms import Media
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
 
 from tagging.models import Tag
@@ -47,7 +47,7 @@ def optgroups(self, name, value, attrs=None):
 
             for subvalue, sublabel in choices:
                 selected = (
-                    force_text(subvalue) in value and
+                    force_str(subvalue) in value and
                     (has_selected is False or self.allow_multiple_selected)
                 )
                 if selected is True and has_selected is False:

zinnia/apps.py

@@ -1,6 +1,6 @@
 """Apps for Zinnia"""
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class ZinniaConfig(AppConfig):

zinnia/breadcrumbs.py

@@ -7,7 +7,7 @@
 from django.utils.dateformat import DateFormat
 from django.utils.timezone import is_aware
 from django.utils.timezone import localtime
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 
 class Crumb(object):

zinnia/comparison.py

@@ -4,7 +4,6 @@
 from django.contrib.sites.models import Site
 from django.core.cache import InvalidCacheBackendError
 from django.core.cache import caches
-from django.utils import six
 from django.utils.functional import cached_property
 from django.utils.html import strip_tags
 
@@ -94,7 +93,7 @@ def raw_dataset(self):
         for item in queryset:
             item = list(item)
             item_pk = item.pop(0)
-            datas = ' '.join(map(six.text_type, item))
+            datas = ' '.join(map(str, item))
             dataset[item_pk] = self.raw_clean(datas)
         return dataset
 

zinnia/feeds.py

@@ -13,9 +13,9 @@
 from django.template.defaultfilters import slugify
 from django.urls import NoReverseMatch
 from django.urls import reverse
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 from django.utils.feedgenerator import Atom1Feed
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import django_comments as comments
 
@@ -260,14 +260,14 @@ def get_title(self, obj):
         Title of the feed.
         """
         return _('Entries for the author %(object)s') % {
-            'object': smart_text(obj.__str__())}
+            'object': smart_str(obj.__str__())}
 
     def description(self, obj):
         """
         Description of the feed.
         """
         return _('The last entries by %(object)s') % {
-            'object': smart_text(obj.__str__())}
+            'object': smart_str(obj.__str__())}
 
 
 class TagEntries(EntryFeed):

zinnia/flags.py

@@ -1,6 +1,7 @@
 """Comment flags for Zinnia"""
+from functools import lru_cache
+
 from django.contrib.auth import get_user_model
-from django.utils.lru_cache import lru_cache
 
 from zinnia.settings import COMMENT_FLAG_USER_ID
 

zinnia/markups.py

@@ -5,7 +5,7 @@
 import warnings
 
 from django.utils.encoding import force_bytes
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.html import linebreaks
 
 from zinnia.settings import MARKDOWN_EXTENSIONS
@@ -24,7 +24,7 @@ def textile(value):
                       RuntimeWarning)
         return value
 
-    return textile.textile(force_text(value))
+    return textile.textile(force_str(value))
 
 
 def markdown(value, extensions=MARKDOWN_EXTENSIONS):
@@ -41,7 +41,7 @@ def markdown(value, extensions=MARKDOWN_EXTENSIONS):
                       RuntimeWarning)
         return value
 
-    return markdown.markdown(force_text(value), extensions=extensions)
+    return markdown.markdown(force_str(value), extensions=extensions)
 
 
 def restructuredtext(value, settings=RESTRUCTUREDTEXT_SETTINGS):
@@ -58,7 +58,7 @@ def restructuredtext(value, settings=RESTRUCTUREDTEXT_SETTINGS):
     parts = publish_parts(source=force_bytes(value),
                           writer_name='html4css1',
                           settings_overrides=settings)
-    return force_text(parts['fragment'])
+    return force_str(parts['fragment'])
 
 
 def html_format(value):

zinnia/models/author.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 from django.db import models
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
 
 from zinnia.managers import EntryRelatedPublishedManager
 from zinnia.managers import entries_published
@@ -28,7 +27,6 @@ class Meta:
         abstract = True
 
 
-@python_2_unicode_compatible
 class Author(safe_get_user_model(),
              AuthorPublishedManager):
     """

zinnia/models/category.py

@@ -1,8 +1,7 @@
 """Category model for Zinnia"""
 from django.db import models
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from mptt.managers import TreeManager
 from mptt.models import MPTTModel
@@ -12,7 +11,6 @@
 from zinnia.managers import entries_published
 
 
-@python_2_unicode_compatible
 class Category(MPTTModel):
     """
     Simple model for categorizing entries.

zinnia/models_bases/entry.py

@@ -7,10 +7,9 @@
 from django.template.defaultfilters import slugify
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.html import strip_tags
 from django.utils.text import Truncator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import django_comments as comments
 from django_comments.models import CommentFlag
@@ -34,7 +33,6 @@
 from zinnia.url_shortener import get_url_shortener
 
 
-@python_2_unicode_compatible
 class CoreEntry(models.Model):
     """
     Abstract core entry model class providing

zinnia/moderator.py

@@ -6,7 +6,7 @@
 from django.template import loader
 from django.utils.translation import activate
 from django.utils.translation import get_language
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_comments.moderation import CommentModerator
 

zinnia/preview.py

@@ -3,8 +3,6 @@
 
 from bs4 import BeautifulSoup
 
-from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.html import strip_tags
 from django.utils.text import Truncator
@@ -14,7 +12,6 @@
 from zinnia.settings import PREVIEW_SPLITTERS
 
 
-@python_2_unicode_compatible
 class HTMLPreview(object):
     """
     Build an HTML preview of an HTML content.
@@ -52,7 +49,7 @@ def __str__(self):
         """
         Method used to render the preview in templates.
         """
-        return six.text_type(self.preview)
+        return str(self.preview)
 
     def build_preview(self):
         """

zinnia/search.py

@@ -1,6 +1,5 @@
 """Search module with complex query parsing for Zinnia"""
 from django.db.models import Q
-from django.utils import six
 
 from pyparsing import CaselessLiteral
 from pyparsing import Combine
@@ -31,7 +30,7 @@ def create_q(token):
     query = getattr(token, 'query', '')
     wildcards = None
 
-    if isinstance(query, six.string_types):  # Unicode -> Quoted string
+    if isinstance(query, str):  # Unicode -> Quoted string
         search = query
     else:  # List -> No quoted string (possible wildcards)
         if len(query) == 1:

zinnia/templatetags/zinnia.py

@@ -13,7 +13,7 @@
 from django.template.defaultfilters import stringfilter
 from django.template.loader import select_template
 from django.utils import timezone
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
@@ -225,8 +225,8 @@ def get_recent_comments(number=5, template='zinnia/tags/comments_recent.html'):
     """
     Return the most recent comments.
     """
-    # Using map(smart_text... fix bug related to issue #8554
-    entry_published_pks = map(smart_text,
+    # Using map(smart_str... fix bug related to issue #8554
+    entry_published_pks = map(smart_str,
                               Entry.published.values_list('id', flat=True))
     content_type = ContentType.objects.get_for_model(Entry)
 
@@ -247,7 +247,7 @@ def get_recent_linkbacks(number=5,
     """
     Return the most recent linkbacks.
     """
-    entry_published_pks = map(smart_text,
+    entry_published_pks = map(smart_str,
                               Entry.published.values_list('id', flat=True))
     content_type = ContentType.objects.get_for_model(Entry)
 
@@ -400,7 +400,7 @@ def widont(value, autoescape=None):
     def replace(matchobj):
         return ' %s' % matchobj.group(1)
 
-    value = END_PUNCTUATION_WIDONT_REGEXP.sub(replace, esc(smart_text(value)))
+    value = END_PUNCTUATION_WIDONT_REGEXP.sub(replace, esc(smart_str(value)))
     value = WIDONT_REGEXP.sub(replace, value)
     value = DOUBLE_SPACE_PUNCTUATION_WIDONT_REGEXP.sub(replace, value)
 

zinnia/tests/test_admin_fields.py

@@ -1,6 +1,6 @@
 """Test cases for Zinnia's admin fields"""
 from django.test import TestCase
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 from zinnia.admin.fields import MPTTModelChoiceIterator
 from zinnia.admin.fields import MPTTModelMultipleChoiceField
@@ -23,7 +23,7 @@ def prepare_value(self, value):
                 return value.pk
 
             def label_from_instance(self, obj):
-                return smart_text(obj)
+                return smart_str(obj)
 
         field = FakeField()
         iterator = MPTTModelChoiceIterator(field)