Merge pull request #169 from pinax/remove-six

Removed vestigal support for Python 2.7

docs/usage.rst

@@ -162,7 +162,7 @@ For an example of a custom error handler::
             connection = None  # i.e. ask for a new connection
             status = 'deferred'
         else:
-            six.reraise(*sys.exc_info())
+            raise exc
 
         return connection, status
 

setup.cfg

@@ -33,7 +33,6 @@ python_requires = >=3.7
 install_requires =
     Django >= 1.11
     lockfile >= 0.8
-    six
 
 [options.packages.find]
 where = src

src/mailer/__init__.py

@@ -2,8 +2,6 @@
 
 import warnings
 
-import six
-
 __version__ = '2.2'
 
 
@@ -26,11 +24,7 @@ def get_priority(priority):
 
 def send_mail(subject, message, from_email, recipient_list, priority=None,
               fail_silently=False, auth_user=None, auth_password=None):
-    if six.PY2:
-        # Only runs Django 1.11
-        from django.utils.encoding import force_unicode as force_str
-    else:
-        from django.utils.encoding import force_str
+    from django.utils.encoding import force_str
     from mailer.models import make_message
 
     priority = get_priority(priority)
@@ -52,11 +46,7 @@ def send_html_mail(subject, message, message_html, from_email, recipient_list,
     """
     Function to queue HTML e-mails
     """
-    if six.PY2:
-        # Only runs Django 1.11
-        from django.utils.encoding import force_unicode as force_str
-    else:
-        from django.utils.encoding import force_str
+    from django.utils.encoding import force_str
     from django.core.mail import EmailMultiAlternatives
     from mailer.models import make_message
 
@@ -95,11 +85,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=None,
 
 def mail_admins(subject, message, fail_silently=False, connection=None, priority=None):
     from django.conf import settings
-    if six.PY2:
-        # Only runs Django 1.11
-        from django.utils.encoding import force_unicode as force_str
-    else:
-        from django.utils.encoding import force_str
+    from django.utils.encoding import force_str
 
     return send_mail(settings.EMAIL_SUBJECT_PREFIX + force_str(subject),
                      message,
@@ -109,11 +95,7 @@ def mail_admins(subject, message, fail_silently=False, connection=None, priority
 
 def mail_managers(subject, message, fail_silently=False, connection=None, priority=None):
     from django.conf import settings
-    if six.PY2:
-        # Only runs Django 1.11
-        from django.utils.encoding import force_unicode as force_str
-    else:
-        from django.utils.encoding import force_str
+    from django.utils.encoding import force_str
 
     return send_mail(settings.EMAIL_SUBJECT_PREFIX + force_str(subject),
                      message,

src/mailer/engine.py

@@ -3,12 +3,10 @@
 import contextlib
 import logging
 import smtplib
-import sys
 import time
 from socket import error as socket_error
 
 import lockfile
-import six
 from django import VERSION as DJANGO_VERSION
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -145,7 +143,7 @@ def handle_delivery_exception(connection, message, exc):
 
     # The idea is (1) to be backwards compatible with existing behavior
     # and (2) not have delivery errors go unnoticed
-    six.reraise(*sys.exc_info())
+    raise exc
 
 
 def acquire_lock():

src/mailer/models.py

@@ -5,22 +5,13 @@
 import pickle
 import datetime
 
-import six
 
 from django.conf import settings
 
-try:
-    from django.utils.encoding import python_2_unicode_compatible
-except ImportError:
-    def python_2_unicode_compatible(c):
-        return c
 from django.utils.timezone import now as datetime_now
 from django.core.mail import EmailMessage
 from django.db import models
-if six.PY2:
-    from django.utils.translation import ugettext_lazy as _
-else:
-    from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 PRIORITY_HIGH = 1
@@ -128,7 +119,6 @@ def db_to_email(data):
                 return None
 
 
-@python_2_unicode_compatible
 class Message(BigAutoModel):
     """
     The email stored for later sending.
@@ -288,7 +278,6 @@ def purge_old_entries(self, days, result_codes=None):
         return count
 
 
-@python_2_unicode_compatible
 class MessageLog(BigAutoModel):
     """
     A log entry which stores the result (and optionally a log message) for an

tests/test_mailer.py

@@ -13,7 +13,6 @@
 from django.test import TestCase
 from django.utils.timezone import now as datetime_now
 from mock import Mock, patch
-import six
 
 import mailer
 from mailer import engine
@@ -653,7 +652,7 @@ def test_message_str(self):
 
             msg = Message.objects.get()
             self.assertEqual(
-                six.text_type(msg),
+                str(msg),
                 'On {0}, "Subject Msg 中" to [email protected]'.format(msg.when_added),
             )
             msg.message_data = None
@@ -668,7 +667,7 @@ def test_message_log_str(self):
 
             log = MessageLog.objects.get()
             self.assertEqual(
-                six.text_type(log),
+                str(log),
                 'On {0}, "Subject Log 中" to [email protected]'.format(log.when_attempted),
             )
 

tox.ini

@@ -22,6 +22,7 @@ commands =
     test: coverage run ./runtests.py
     flake: flake8 --statistics --benchmark
     checkmanifest: check-manifest
+allowlist_externals = flake8
 deps =
     coverage
     -r requirements-test.txt