Run pyupgrade

Co-authored-by: Terence D. Honles <terence@honles.com>

Author: medmunds

anymail/backends/amazon_ses.py

@@ -435,7 +435,7 @@ def finalize_payload(self):
     def parse_recipient_status(self, response):
         try:
             results = response["BulkEmailEntryResults"]
-            ses_status_set = set(result["Status"] for result in results)
+            ses_status_set = {result["Status"] for result in results}
             anymail_statuses = [
                 AnymailRecipientStatus(
                     message_id=result.get("MessageId", None),

anymail/backends/base.py

@@ -391,7 +391,7 @@ def is_batch(self):
     def unsupported_feature(self, feature):
         if not self.backend.ignore_unsupported_features:
             raise AnymailUnsupportedFeature(
-                "%s does not support %s" % (self.esp_name, feature),
+                f"{self.esp_name} does not support {feature}",
                 email_message=self.message,
                 payload=self,
                 backend=self.backend,
@@ -462,9 +462,7 @@ def validate_not_bare_string(self, attr, value):
         #   TypeError: can only concatenate list (not "str") to list
         #   TypeError: Can't convert 'list' object to str implicitly
         if isinstance(value, str) or is_lazy(value):
-            raise TypeError(
-                '"{attr}" attribute must be a list or other iterable'.format(attr=attr)
-            )
+            raise TypeError(f'"{attr}" attribute must be a list or other iterable')
 
     #
     # Attribute converters

anymail/backends/base_requests.py

@@ -150,7 +150,7 @@ def _dump_api_request(response, **kwargs):
                 method=request.method,
                 url=request.url,
                 headers="".join(
-                    "{header}: {value}\n".format(header=header, value=value)
+                    f"{header}: {value}\n"
                     for (header, value) in request.headers.items()
                 ),
             )
@@ -168,7 +168,7 @@ def _dump_api_request(response, **kwargs):
                 status=response.status_code,
                 reason=response.reason,
                 headers="".join(
-                    "{header}: {value}\n".format(header=header, value=value)
+                    f"{header}: {value}\n"
                     for (header, value) in response.headers.items()
                 ),
                 body=response.text,  # Let Requests decode body content for us

anymail/backends/mailgun.py

@@ -217,15 +217,15 @@ def populate_recipient_variables(self):
         if self.merge_metadata:
 
             def vkey(key):  # 'v:key'
-                return "v:{}".format(key)
+                return f"v:{key}"
 
             # all keys used in any recipient's merge_metadata:
             merge_metadata_keys = flatset(
                 recipient_data.keys() for recipient_data in self.merge_metadata.values()
             )
             # custom_data['key'] = '%recipient.v:key%' indirection:
             custom_data.update(
-                {key: "%recipient.{}%".format(vkey(key)) for key in merge_metadata_keys}
+                {key: f"%recipient.{vkey(key)}%" for key in merge_metadata_keys}
             )
             # defaults for each recipient must cover all keys:
             base_recipient_data = {
@@ -268,14 +268,14 @@ def vkey(key):  # 'v:key'
                     )
                 # custom_data['key'] = '%recipient.key%' indirection:
                 custom_data.update(
-                    {key: "%recipient.{}%".format(key) for key in merge_data_keys}
+                    {key: f"%recipient.{key}%" for key in merge_data_keys}
                 )
 
         # (6) merge_headers --> Mailgun recipient_variables via 'h:'-prefixed keys
         if self.merge_headers:
 
             def hkey(field_name):  # 'h:Field-Name'
-                return "h:{}".format(field_name.title())
+                return f"h:{field_name.title()}"
 
             merge_header_fields = flatset(
                 recipient_headers.keys()
@@ -461,4 +461,4 @@ def flatset(iterables):
     >>> flatset([1, 2], [2, 3])
     set(1, 2, 3)
     """
-    return set(item for iterable in iterables for item in iterable)
+    return {item for iterable in iterables for item in iterable}

anymail/backends/mailtrap.py

@@ -2,9 +2,11 @@
 from urllib.parse import quote
 
 if sys.version_info < (3, 11):
-    from typing_extensions import Any, Dict, List, Literal, NotRequired, TypedDict
+    from typing import Any, Literal
+
+    from typing_extensions import NotRequired, TypedDict
 else:
-    from typing import Any, Dict, List, Literal, NotRequired, TypedDict
+    from typing import Any, Literal, NotRequired, TypedDict
 
 from ..exceptions import AnymailRequestsAPIError
 from ..message import AnymailMessage, AnymailRecipientStatus
@@ -31,29 +33,26 @@ class MailtrapAttachment(TypedDict):
         # Although "from" and "subject" are technically required,
         # allow Mailtrap's API to enforce that.
         "from": NotRequired[MailtrapAddress],
-        "to": NotRequired[List[MailtrapAddress]],
-        "cc": NotRequired[List[MailtrapAddress]],
-        "bcc": NotRequired[List[MailtrapAddress]],
+        "to": NotRequired[list[MailtrapAddress]],
+        "cc": NotRequired[list[MailtrapAddress]],
+        "bcc": NotRequired[list[MailtrapAddress]],
         "reply_to": NotRequired[MailtrapAddress],
-        "attachments": NotRequired[List[MailtrapAttachment]],
-        "headers": NotRequired[Dict[str, str]],
-        "custom_variables": NotRequired[Dict[str, str]],
+        "attachments": NotRequired[list[MailtrapAttachment]],
+        "headers": NotRequired[dict[str, str]],
+        "custom_variables": NotRequired[dict[str, str]],
         "subject": NotRequired[str],
         "text": NotRequired[str],
         "html": NotRequired[str],
         "category": NotRequired[str],
         "template_uuid": NotRequired[str],
-        "template_variables": NotRequired[Dict[str, Any]],
+        "template_variables": NotRequired[dict[str, Any]],
     },
 )
 
-MailtrapBatchData = TypedDict(
-    "MailtrapBatchData",
-    {
-        "base": MailtrapData,
-        "requests": List[MailtrapData],
-    },
-)
+
+class MailtrapBatchData(TypedDict):
+    base: MailtrapData
+    requests: list[MailtrapData]
 
 
 class MailtrapPayload(RequestsPayload):
@@ -74,14 +73,14 @@ def __init__(
         self.backend = backend
 
         # Late bound batch send data
-        self.merge_data: Dict[str, Any] = {}
-        self.merge_metadata: Dict[str, Dict[str, str]] = {}
-        self.merge_headers: Dict[str, Dict[str, str]] = {}
+        self.merge_data = dict[str, Any]()
+        self.merge_metadata = dict[str, dict[str, str]]()
+        self.merge_headers = dict[str, dict[str, str]]()
 
         # needed for backend.parse_recipient_status
-        self.recipients_to: List[str] = []
-        self.recipients_cc: List[str] = []
-        self.recipients_bcc: List[str] = []
+        self.recipients_to = list[str]()
+        self.recipients_cc = list[str]()
+        self.recipients_bcc = list[str]()
 
         super().__init__(
             message, defaults, backend, *args, headers=http_headers, **kwargs
@@ -141,7 +140,7 @@ def set_from_email(self, email: EmailAddress):
         self.data["from"] = email.as_dict(idna_encode=self.backend.idna_encode)
 
     def set_recipients(
-        self, recipient_type: Literal["to", "cc", "bcc"], emails: List[EmailAddress]
+        self, recipient_type: Literal["to", "cc", "bcc"], emails: list[EmailAddress]
     ):
         assert recipient_type in ["to", "cc", "bcc"]
         if emails:
@@ -161,7 +160,7 @@ def set_subject(self, subject):
             # (must ignore default empty subject for use with template_uuid)
             self.data["subject"] = subject
 
-    def set_reply_to(self, emails: List[EmailAddress]):
+    def set_reply_to(self, emails: list[EmailAddress]):
         if len(emails) == 1:
             # Let Mailtrap handle the header generation (and EAI if needed)
             self.data["reply_to"] = emails[0].as_dict(
@@ -210,7 +209,7 @@ def add_attachment(self, attachment: Attachment):
             att["content_id"] = attachment.cid
         self.data.setdefault("attachments", []).append(att)
 
-    def set_tags(self, tags: List[str]):
+    def set_tags(self, tags: list[str]):
         if len(tags) > 1:
             self.unsupported_feature("multiple tags")
         if len(tags) > 0:
@@ -232,7 +231,7 @@ def set_merge_headers(self, merge_headers):
         # Late-bound in burst_for_batch
         self.merge_headers = merge_headers
 
-    def set_merge_global_data(self, merge_global_data: Dict[str, Any]):
+    def set_merge_global_data(self, merge_global_data: dict[str, Any]):
         self.data.setdefault("template_variables", {}).update(merge_global_data)
 
     def set_merge_metadata(self, merge_metadata):
@@ -315,7 +314,7 @@ def parse_recipient_status(
 
             # Merge recipient statuses for each item in the batch.
             # Each API response includes message_ids in the order 'to', 'cc, 'bcc'.
-            recipient_status: Dict[str, AnymailRecipientStatus] = {}
+            recipient_status: dict[str, AnymailRecipientStatus] = {}
             for to, one_response in zip(payload.recipients_to, responses):
                 recipients = [to, *payload.recipients_cc, *payload.recipients_bcc]
                 one_status = self.parse_one_response(
@@ -339,11 +338,11 @@ def parse_recipient_status(
     def parse_one_response(
         self,
         one_response,
-        recipients: List[str],
+        recipients: list[str],
         raw_response,
         payload: MailtrapPayload,
         message: AnymailMessage,
-    ) -> Dict[str, AnymailRecipientStatus]:
+    ) -> dict[str, AnymailRecipientStatus]:
         """
         Return parsed status for recipients in one_response, which is either
         a top-level send response or an individual 'responses' item for batch send.

anymail/message.py

@@ -117,7 +117,7 @@ def __init__(self, message_id, status):
         try:
             # message_id must be something that can be put in a set
             # (see AnymailStatus.set_recipient_status)
-            set([message_id])
+            {message_id}
         except TypeError:
             raise TypeError("Invalid message_id %r is not scalar type" % message_id)
         if status is not None and status not in ANYMAIL_STATUSES:
@@ -152,11 +152,9 @@ def _repr(o):
             else:
                 return repr(o)
 
-        details = ["status={status}".format(status=_repr(self.status))]
+        details = [f"status={_repr(self.status)}"]
         if self.message_id:
-            details.append(
-                "message_id={message_id}".format(message_id=_repr(self.message_id))
-            )
+            details.append(f"message_id={_repr(self.message_id)}")
         if self.recipients:
             details.append(
                 "{num_recipients} recipients".format(
@@ -168,9 +166,7 @@ def _repr(o):
     def set_recipient_status(self, recipients):
         self.recipients.update(recipients)
         recipient_statuses = self.recipients.values()
-        self.message_id = set(
-            [recipient.message_id for recipient in recipient_statuses]
-        )
+        self.message_id = {recipient.message_id for recipient in recipient_statuses}
         if len(self.message_id) == 1:
             self.message_id = self.message_id.pop()  # de-set-ify if single message_id
-        self.status = set([recipient.status for recipient in recipient_statuses])
+        self.status = {recipient.status for recipient in recipient_statuses}

anymail/utils.py

@@ -552,17 +552,12 @@ def __init__(self, attachment):
                 self.cid = unquote(content_id)  # without the <>
 
     def __repr__(self):
-        details = [
-            self.mimetype,
-            "len={length}".format(length=len(self.content)),
-        ]
+        details = [self.mimetype, f"len={len(self.content)}"]
         if self.name:
-            details.append("name={name!r}".format(name=self.name))
+            details.append(f"name={self.name!r}")
         if self.inline:
             details.insert(0, "inline")
-            details.append(
-                "content_id={content_id!r}".format(content_id=self.content_id)
-            )
+            details.append(f"content_id={self.content_id!r}")
         return "Attachment<{details}>".format(details=", ".join(details))
 
     @property
@@ -644,12 +639,12 @@ def get_anymail_setting(
                 except AttributeError:
                     pass
             if default is UNSET:
-                message = "You must set %s or ANYMAIL = {'%s': ...}" % (
-                    anymail_setting,
-                    setting,
+                message = (
+                    f"You must set {anymail_setting} or ANYMAIL = {{'{setting}': ...}}"
                 )
+
                 if allow_bare:
-                    message += " or %s" % setting
+                    message += f" or {setting}"
                 message += " in your Django settings"
                 raise AnymailConfigurationError(message) from None
             else:

anymail/webhooks/amazon_ses.py

@@ -208,9 +208,7 @@ def auto_confirm_sns_subscription(self, sns_message):
                 _resource,
             ) = topic_arn.split(":", maxsplit=6)
         except (TypeError, ValueError):
-            raise ValueError(
-                "Invalid ARN format '{topic_arn!s}'".format(topic_arn=topic_arn)
-            )
+            raise ValueError(f"Invalid ARN format '{topic_arn!s}'")
 
         sns_client = self.get_boto_client("sns", region_name=region)
         try:

anymail/webhooks/mailgun.py

@@ -91,7 +91,7 @@ def validate_request(self, request):
 
         expected_signature = hmac.new(
             key=self.webhook_signing_key,
-            msg="{}{}".format(timestamp, token).encode("ascii"),
+            msg=f"{timestamp}{token}".encode("ascii"),
             digestmod=hashlib.sha256,
         ).hexdigest()
         if not constant_time_compare(signature, expected_signature):
@@ -165,7 +165,7 @@ def esp_to_anymail_event(self, esp_event):
         except KeyError:
             message_id = None
         if message_id and not message_id.startswith("<"):
-            message_id = "<{}>".format(message_id)
+            message_id = f"<{message_id}>"
 
         metadata = event_data.get("user-variables", {})
         tags = event_data.get("tags", [])
@@ -270,7 +270,7 @@ def mailgun_legacy_to_anymail_event(self, esp_event):
             "message-id", None
         )
         if message_id and not message_id.startswith("<"):
-            message_id = "<{}>".format(message_id)
+            message_id = f"<{message_id}>"
 
         description = esp_event.getfirst("description", None)
         mta_response = esp_event.getfirst("error", None) or esp_event.getfirst(

anymail/webhooks/mailtrap.py

@@ -3,9 +3,11 @@
 from datetime import datetime, timezone
 
 if sys.version_info < (3, 11):
-    from typing_extensions import Dict, Literal, NotRequired, TypedDict, Union
+    from typing import Literal
+
+    from typing_extensions import NotRequired, TypedDict
 else:
-    from typing import Dict, Literal, NotRequired, TypedDict, Union
+    from typing import Literal, NotRequired, TypedDict
 
 from ..signals import AnymailTrackingEvent, EventType, RejectReason, tracking
 from .base import AnymailBaseWebhookView
@@ -30,7 +32,7 @@ class MailtrapEvent(TypedDict):
     timestamp: int
     event_id: str
     category: NotRequired[str]
-    custom_variables: NotRequired[Dict[str, Union[str, int, float, bool]]]
+    custom_variables: NotRequired[dict[str, str | int | float | bool]]
     reason: NotRequired[str]
     response: NotRequired[str]
     response_code: NotRequired[int]