Merge pull request #351 from smithdc1/pyupgrade

Updated to Py3 code style, removed Six and mock dependencies

Pipfile

@@ -8,14 +8,12 @@ django-imperavi = "*"
 django-tinymce = "*"
 pytz = "*"
 django-webtest = "*"
-mock = "*"
 WebTest = "*"
 python-card-me = "<1.0"
 ldif3 = "<3.2"
 chardet = "*"
 surlex = ">=0.2.0"
 sorl-thumbnail = ">=12.6.3"
-six = "*"
 unicodecsv = "<0.15"
 Django = ">=2.2.16"
 Pillow = ">=6.2.2"

newsletter/admin.py

@@ -1,13 +1,9 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.urls import path
 
 logger = logging.getLogger(__name__)
 
-import six
-
 from django.db import models
 
 from django.conf import settings
@@ -98,7 +94,7 @@ def admin_submissions(self, obj):
     admin_submissions.short_description = ''
 
 
-class NewsletterAdminLinkMixin(object):
+class NewsletterAdminLinkMixin:
     def admin_newsletter(self, obj):
         opts = Newsletter._meta
         newsletter = obj.newsletter
@@ -192,7 +188,7 @@ def submit(self, request, object_id):
 
     """ URLs """
     def get_urls(self):
-        urls = super(SubmissionAdmin, self).get_urls()
+        urls = super().get_urls()
 
         my_urls = [
             path(
@@ -240,7 +236,7 @@ def has_change_permission(self, request, obj=None):
 else:
     ArticleInlineClassTuple = (StackedInline,)
 
-BaseArticleInline = type(str('BaseArticleInline'), ArticleInlineClassTuple, {})
+BaseArticleInline = type('BaseArticleInline', ArticleInlineClassTuple, {})
 
 class ArticleInline(BaseArticleInline):
     model = Article
@@ -361,7 +357,7 @@ def subscribers_json(self, request, object_id):
 
     """ URLs """
     def get_urls(self):
-        urls = super(MessageAdmin, self).get_urls()
+        urls = super().get_urls()
 
         my_urls = [
             path('<object_id>/preview/',
@@ -509,7 +505,7 @@ def subscribers_import_confirm(self, request):
             form = ConfirmForm(request.POST)
             if form.is_valid():
                 try:
-                    for email, name in six.iteritems(addresses):
+                    for email, name in addresses.items():
                         address_inst = make_subscription(
                             newsletter, email, name
                         )
@@ -542,7 +538,7 @@ def subscribers_import_confirm(self, request):
 
     """ URLs """
     def get_urls(self):
-        urls = super(SubscriptionAdmin, self).get_urls()
+        urls = super().get_urls()
 
         my_urls = [
             path('import/',

newsletter/admin_forms.py

@@ -110,7 +110,7 @@ class Meta:
         }
 
     def __init__(self, *args, **kwargs):
-        super(SubscriptionAdminForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.fields['subscribed'].label = _('Status')
 
@@ -131,7 +131,7 @@ def clean_name_field(self):
         return data
 
     def clean(self):
-        cleaned_data = super(SubscriptionAdminForm, self).clean()
+        cleaned_data = super().clean()
         if not (cleaned_data.get('user', None) or
                 cleaned_data.get('email_field', None)):
 
@@ -172,7 +172,7 @@ class ArticleFormSet(forms.BaseInlineFormSet):
     """ Formset for articles yielding default sortoder. """
 
     def __init__(self, *args, **kwargs):
-        super(ArticleFormSet, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         assert self.instance
         next_sortorder = self.instance.get_next_article_sortorder()

newsletter/admin_utils.py

@@ -7,7 +7,7 @@
 from .models import Subscription
 
 
-class ExtendibleModelAdminMixin(object):
+class ExtendibleModelAdminMixin:
     def _getobj(self, request, object_id):
             opts = self.model._meta
 

newsletter/forms.py

@@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs):
         else:
             ip = None
 
-        super(NewsletterForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.instance.newsletter = newsletter
 
@@ -88,7 +88,7 @@ def clean(self):
                 _("This subscription has not yet been activated.")
             )
 
-        return super(UpdateRequestForm, self).clean()
+        return super().clean()
 
     def clean_email_field(self):
         data = self.cleaned_data['email_field']
@@ -121,7 +121,7 @@ def clean(self):
                 _("This subscription has already been unsubscribed from.")
             )
 
-        return super(UnsubscribeRequestForm, self).clean()
+        return super().clean()
 
 
 class UpdateForm(NewsletterForm):

newsletter/models.py

@@ -272,7 +272,7 @@ def save(self, *args, **kwargs):
             elif self.unsubscribed:
                 self._unsubscribe()
 
-        super(Subscription, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     ip = models.GenericIPAddressField(_("IP address"), blank=True, null=True)
 
@@ -435,7 +435,7 @@ def save(self, **kwargs):
             # as to assure uniqueness.
             self.sortorder = self.post.get_next_article_sortorder()
 
-        super(Article, self).save()
+        super().save()
 
 
 def attachment_upload_to(instance, filename):
@@ -454,7 +454,7 @@ class Meta:
         verbose_name_plural = _('attachments')
 
     def __str__(self):
-        return _(u"%(file_name)s on %(message)s") % {
+        return _("%(file_name)s on %(message)s") % {
             'file_name': self.file_name,
             'message': self.message
         }
@@ -681,7 +681,7 @@ def save(self, **kwargs):
 
         self.newsletter = self.message.newsletter
 
-        return super(Submission, self).save()
+        return super().save()
 
     def get_absolute_url(self):
         assert self.newsletter.slug

newsletter/settings.py

@@ -7,7 +7,7 @@
 from .utils import Singleton
 
 
-class Settings(object):
+class Settings:
     """
     A settings object that proxies settings and handles defaults, inspired
     by `django-appconf` and the way it works  in `django-rest-framework`.

newsletter/utils.py

@@ -35,7 +35,7 @@ class Singleton(type):
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            cls._instances[cls] = super(Singleton, cls).__call__(
+            cls._instances[cls] = super().__call__(
                 *args, **kwargs
             )