[pre-commit.ci] pre-commit autoupdate (#152)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 23.12.1 → 24.1.1](psf/black@23.12.1...24.1.1)
- [github.com/PyCQA/bandit: 1.7.6 → 1.7.7](PyCQA/bandit@1.7.6...1.7.7)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -55,7 +55,7 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.1.1
     hooks:
       - id: black
   - repo: https://github.com/pre-commit/mirrors-mypy
@@ -96,7 +96,7 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.6
+    rev: 1.7.7
     hooks:
       - id: bandit
         language_version: python3

hasmail/models/__init__.py

@@ -1,4 +1,5 @@
 """Hasmail models."""
+
 # flake8: noqa
 
 from __future__ import annotations

hasmail/views/email.py

@@ -130,9 +130,11 @@ def recipient_view(mailer: Mailer, recipient: MailerRecipient) -> ResponseReturn
             {
                 'template': ob.template,
                 'preview': recipient.get_preview(),
-                'subject': recipient.subject
-                if recipient.subject is not None
-                else draft.subject,
+                'subject': (
+                    recipient.subject
+                    if recipient.subject is not None
+                    else draft.subject
+                ),
                 'revision_id': ob.revision_id,
             }
         )

hasmail/views/mailer.py

@@ -218,12 +218,14 @@ def mailer_send_do(mailer_id: int, user_uuid: UUID, email: str) -> None:
             # 3. Send message
             msg = Message(
                 subject=(
-                    recipient.subject
-                    if recipient.subject is not None
+                    (
+                        recipient.subject
+                        if recipient.subject is not None
+                        else draft.subject
+                    )
+                    if recipient.custom_draft
                     else draft.subject
-                )
-                if recipient.custom_draft
-                else draft.subject,
+                ),
                 sender=formataddr((user.fullname, email)),
                 recipients=[formataddr((recipient.fullname or '', recipient.email))],
                 body=recipient.rendered_text,

migrations/versions/124505044ba4_count_opens.py

@@ -6,7 +6,6 @@
 
 """
 
-
 import sqlalchemy as sa
 from alembic import op