refactor!: Drop support for Python 2.7, 3.3, 3.4, PyPy2 and Jython.

README.rst

@@ -102,7 +102,7 @@ Or you can look at the docs/ directory in the repository.
 Python support
 ==============
 
-Postmarker supports Python 2.7, 3.4, 3.5, 3.6, 3.7, PyPy, PyPy3 and Jython.
+Postmarker supports Python 3.5, 3.6, 3.7 and PyPy3.
 
 Thanks
 ======

docs/changelog.rst

@@ -6,6 +6,11 @@ Changelog
 `Unreleased`_
 -------------
 
+Removed
+~~~~~~~
+
+- Support for Python 2.7, 3.3, 3.4, PyPy2 and Jython.
+
 `0.14.1`_ - 2020-03-31
 ----------------------
 

docs/django.rst

@@ -18,7 +18,7 @@ For convenience, Postmarker provides a Django email backend. To use it you have
 That's it!
 For every supported Python version, the backend is tested on the latest Django release that supports given the Python version:
 
- - Python 2.7, 3.4, 3.5, 3.6, PyPy - Django 1.10
+ - Python 3.5, 3.6 - Django 1.10
 
 
 Example:

postmarker/__init__.py

@@ -1,4 +1 @@
-# coding: utf-8
-
-
 __version__ = "0.14.1"

postmarker/_compat.py

@@ -1,21 +1,3 @@
-# coding: utf-8
-
-
-try:
-    from urllib.parse import urljoin
-except ImportError:  # Python 2.7
-    from urlparse import urljoin  # noqa
-
-
-try:
-    from unittest.mock import patch
-except ImportError:  # Python < 3.3
-    try:
-        from mock import patch  # noqa
-    except ImportError:
-        patch = None
-
-
 try:
     from inspect import signature
 

postmarker/core.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 import sys
+from urllib.parse import urljoin
 
 import requests
 
 from . import __version__
-from ._compat import get_args, urljoin
 from .exceptions import ClientError, SpamAssassinError
 from .logging import get_logger
 from .models.bounces import BounceManager
@@ -17,6 +16,7 @@
 from .models.status import StatusManager
 from .models.templates import TemplateManager
 from .models.triggers import TriggersManager
+from .utils import get_args
 
 DEFAULT_API = "https://api.postmarkapp.com/"
 STATUS_API = "https://status.postmarkapp.com/api/1.0/"
@@ -25,7 +25,7 @@
 TEST_TOKEN = "POSTMARK_API_TEST"
 
 
-class PostmarkClient(object):
+class PostmarkClient:
     """Basic class for API clients. Provides basic functionality to make requests."""
 
     _managers = (
@@ -73,7 +73,7 @@ def from_config(cls, config, prefix="postmark_", is_uppercase=False):
         return cls(**kwargs)
 
     def __repr__(self):
-        return "<%s: %s>" % (self.__class__.__name__, self.server_token)
+        return "<{}: {}>".format(self.__class__.__name__, self.server_token)
 
     def _setup_managers(self):
         """Allows to access manager by model name.
@@ -144,4 +144,4 @@ def check_response(self, response):
             raise ClientError(message, error_code=data["ErrorCode"])
 
     def format_exception_message(self, data):
-        return "[%s] %s" % (data["ErrorCode"], data["Message"])
+        return "[{}] {}".format(data["ErrorCode"], data["Message"])

postmarker/django/__init__.py

@@ -1,3 +1,2 @@
-# coding: utf-8
 from .backend import EmailBackend, PostmarkEmailMessage, PostmarkEmailMixin, PostmarkEmailMultiAlternatives  # noqa
 from .signals import post_send, pre_send  # noqa

postmarker/django/backend.py

@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import absolute_import
-
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.core.mail import EmailMessage, EmailMultiAlternatives
@@ -19,7 +16,7 @@ class EmailBackend(BaseEmailBackend):
     """A wrapper that manages sending emails via Postmark API."""
 
     def __init__(self, token=None, fail_silently=False, **kwargs):
-        super(EmailBackend, self).__init__(fail_silently=fail_silently)
+        super().__init__(fail_silently=fail_silently)
         self.client = None
         if self.get_option("TEST_MODE"):
             self.server_token = TEST_TOKEN
@@ -88,13 +85,13 @@ def prepare_message(self, message):
         return instance
 
 
-class PostmarkEmailMixin(object):
+class PostmarkEmailMixin:
     """Provides an ability to set tags on Django email instances."""
 
     def __init__(self, *args, **kwargs):
         self.tag = kwargs.pop("tag", None)
         self.metadata = kwargs.pop("metadata", None)
-        super(PostmarkEmailMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class PostmarkEmailMessage(PostmarkEmailMixin, EmailMessage):

postmarker/django/signals.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from django.dispatch import Signal
 
 pre_send = Signal(providing_args=["messages"])

postmarker/exceptions.py

@@ -1,6 +1,3 @@
-# coding=utf-8
-
-
 class PostmarkerException(Exception):
     """Base class for all exceptions in Postmarker."""
 
@@ -10,7 +7,7 @@ class ClientError(PostmarkerException):
 
     def __init__(self, *args, **kwargs):
         self.error_code = kwargs.pop("error_code")
-        super(ClientError, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class SpamAssassinError(PostmarkerException):

postmarker/logging.py

@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import absolute_import
-
 import logging
 
 DEFAULT_LOGGING_LEVEL = logging.CRITICAL

postmarker/models/__init__.py

@@ -1 +0,0 @@
-# coding: utf-8

postmarker/models/base.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 from json import loads
 
 from ..utils import sizes
 
 
-class Model(object):
+class Model:
     """Abstract data model for Postmark entities."""
 
     _data = None
@@ -14,7 +13,7 @@ def __init__(self, manager=None, **kwargs):
         self._update(kwargs)
 
     def __str__(self):
-        return "%s: %s" % (self.__class__.__name__, self._data.get("ID"))
+        return "{}: {}".format(self.__class__.__name__, self._data.get("ID"))
 
     def __repr__(self):
         return "<%s>" % self
@@ -38,7 +37,7 @@ def as_dict(self):
         return self._data.copy()
 
 
-class ModelManager(object):
+class ModelManager:
     """Proxies calls to main API client. Encapsulates logic of certain part of API - bounces, emails, etc."""
 
     name = None
@@ -109,7 +108,7 @@ class SubModelManager(ModelManager):
     _managers = ()
 
     def __init__(self, *args, **kwargs):
-        super(SubModelManager, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._setup_managers()
 
     def _setup_managers(self):

postmarker/models/bounces.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Bounces.
 
 Information about bounces is available via the :py:class:`~postmarker.models.bounces.BounceManager`,

postmarker/models/domains.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 from .base import Model, ModelManager
 
 
 class Domain(Model):
     def __str__(self):
-        return "%s: %s (%s)" % (
+        return "{}: {} ({})".format(
             self.__class__.__name__,
             self._data.get("Name"),
             self._data.get("ID"),

postmarker/models/emails.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Basic ways to send emails."""
 import mimetypes
 import os
@@ -117,7 +116,7 @@ def __init__(self, **kwargs):
             kwargs["Headers"] = {}
         if not kwargs.get("Attachments"):
             kwargs["Attachments"] = []
-        super(BaseEmail, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def __setitem__(self, key, value):
         self.Headers[key] = value
@@ -130,7 +129,7 @@ def as_dict(self):
 
         :return:
         """
-        data = super(BaseEmail, self).as_dict()
+        data = super().as_dict()
         data["Headers"] = [{"Name": name, "Value": value} for name, value in data["Headers"].items()]
         for field in ("To", "Cc", "Bcc"):
             if field in data:
@@ -181,7 +180,7 @@ def prepare_header(value):
 class Email(BaseEmail):
     def __init__(self, **kwargs):
         assert kwargs.get("TextBody") or kwargs.get("HtmlBody"), "Provide either email TextBody or HtmlBody or both"
-        super(Email, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     @classmethod
     def from_mime(cls, message, manager):
@@ -231,7 +230,7 @@ class EmailBatch(Model):
 
     def __init__(self, *emails, **kwargs):
         self.emails = emails
-        super(EmailBatch, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def __len__(self):
         return len(self.emails)

postmarker/models/messages.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from base64 import b64decode
 from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
@@ -69,7 +68,7 @@ def get(self):
 class OutboundMessage(BaseMessage):
     def __str__(self):
         recipients = ", ".join(self._data.get("Recipients"))
-        return "%s message to %s" % (self._data.get("Status"), recipients)
+        return "{} message to {}".format(self._data.get("Status"), recipients)
 
     def get_dump(self):
         return self._manager.get_dump(self.MessageID)
@@ -134,7 +133,7 @@ def get_dump(self, id):
 
 class InboundMessage(BaseMessage):
     def __str__(self):
-        return "%s message from %s" % (self._data.get("Status"), self._data.get("From"))
+        return "{} message from {}".format(self._data.get("Status"), self._data.get("From"))
 
     def __getitem__(self, item):
         for header in self._data["Headers"]:
@@ -175,7 +174,7 @@ def __str__(self):
         return self.Name
 
     def __repr__(self):
-        return "<%s: %s>" % (self.__class__.__name__, self)
+        return "<{}: {}>".format(self.__class__.__name__, self)
 
     def __len__(self):
         return self.ContentLength

postmarker/models/senders.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 import warnings
 
 from .base import Model, ModelManager

postmarker/models/server.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 from .base import Model, ModelManager
 
 
 class Server(Model):
     def __str__(self):
-        return "%s: %s (%s)" % (
+        return "{}: {} ({})".format(
             self.__class__.__name__,
             self.Name,
             self._data.get("ID"),

postmarker/models/stats.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from .base import ModelManager
 
 

postmarker/models/status.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 from .base import Model, ModelManager
 
 
 class Incident(Model):
     def __str__(self):
-        return "%s: %s" % (self.__class__.__name__, self._data.get("id"))
+        return "{}: {}".format(self.__class__.__name__, self._data.get("id"))
 
 
 class IncidentsManager(ModelManager):
@@ -31,7 +30,7 @@ class StatusManager(ModelManager):
     name = "status"
 
     def __init__(self, *args, **kwargs):
-        super(StatusManager, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.incidents = IncidentsManager(self.client)
 
     def call(self, *args, **kwargs):

postmarker/models/templates.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 from .base import Model, ModelManager
 
 
 class Template(Model):
     def __str__(self):
-        return "%s: %s (%s)" % (
+        return "{}: {} ({})".format(
             self.__class__.__name__,
             self._data.get("Name"),
             self._data.get("TemplateId"),

postmarker/models/triggers.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from .base import Model, ModelManager, SubModelManager
 
 

postmarker/pytest.py

@@ -1,9 +1,7 @@
-# coding: utf-8
-from __future__ import absolute_import
+from unittest.mock import patch
 
 import pytest
 
-from ._compat import patch
 from .core import PostmarkClient, requests
 
 

postmarker/tornado.py

@@ -1,10 +1,9 @@
-# coding: utf-8
 from .core import PostmarkClient
 
 POSTMARK_SERVER_TOKEN = "postmark_server_token"
 
 
-class PostmarkMixin(object):
+class PostmarkMixin:
     @property
     def postmark_client(self):
         self.require_setting(POSTMARK_SERVER_TOKEN, "Postmark client")

postmarker/utils.py

@@ -1,4 +1,4 @@
-# coding: utf-8
+from inspect import signature
 
 
 def chunks(container, n):
@@ -20,3 +20,7 @@ def sizes(count, offset=0, max_chunk=500):
             count = max(0, count - max_chunk)
             yield chunk, offset
             offset += chunk
+
+
+def get_args(cls):
+    return list(signature(cls).parameters)