django-pfx 1.7.6.dev27__tar.gz → 1.7.6.dev31__tar.gz

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.6.dev27
+Version: 1.7.6.dev31
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.6.dev27
+Version: 1.7.6.dev31
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

django_pfx-1.7.6.dev31/django_pfx.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.5",
+  "distance": 31,
+  "node": "gc20f1b5b51acb97a77634b4c145fe90573edd05e",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-06"
+}

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/pfx/emails/shortcuts.py

@@ -1,4 +1,5 @@
 import logging
+import mimetypes
 from pathlib import Path
 
 from django.conf import settings
@@ -105,7 +106,9 @@ def send_email_message(
 
     if attachments:
         for att in attachments:
-            if {'key', 'name', 'content-type'} <= att.file.keys():
+            if (isinstance(getattr(att, 'file', None), dict) and
+                    {'key', 'name', 'content-type'} <= att.file.keys()):
+                # Is a JSON (equivalent to MediaField)
                 fp = Path(settings.STORAGE_LOCAL_ROOT, att.file['key'])
                 if attachment_file_name and callable(attachment_file_name):
                     name = attachment_file_name(att)
@@ -118,9 +121,20 @@ def send_email_message(
                 except Exception as e:
                     logger.error(
                         "Error attaching file %s: %s", fp, str(e), exc_info=e)
+            elif isinstance(att, (tuple, list)):
+                # Is a tuple name, content, (mimetype)
+                if len(att) < 2:
+                    logger.error(
+                        "Tuple attachment must have min 2 values : %s values",
+                        len(att))
+                name, content, *rest = att
+                mimetype = rest[0] if rest else mimetypes.guess_type(name)[0]
+                email.attach(
+                    name, content, mimetype or 'application/octet-stream')
             else:
                 logger.error(
-                    "Attachment pk=%s missing required file keys: %s",
-                    att.pk, att.file.keys())
+                    "Attachment is invalid (must be a "
+                    "JSON MediaField or a tuple): %s",
+                    repr(att)[:100])
 
     email.send()

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/pfx/emails/test.py

@@ -1,3 +1,5 @@
+from email.utils import formataddr
+
 from django.conf import settings
 from django.utils.module_loading import import_string
 
@@ -33,6 +35,14 @@ class EmailTestMixin:
         """The addresses of the ``To`` of ``email``, without the names."""
         return [r['Email'] for r in email.mail_to]
 
+    @classmethod
+    def email_to_rfc(cls, email):
+        """The addresses of the ``To`` of ``email``, with the names."""
+        return [
+            formataddr((r['Name'], r['Email'])) if r.get('Name')
+            else r['Email']
+            for r in email.mail_to]
+
     @classmethod
     def get_email_html(cls, email):
         if not email.html_part:

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-01 06:30+0200\n"
+"POT-Creation-Date: 2026-10-05 17:02+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Your {site_name} verification code: {otp_code}"
 msgstr "Votre code pour {site_name} : {otp_code}"
 
-#: models/abstract_pfx_base_user.py:89
+#: models/abstract_pfx_base_user.py:91
 msgid "User"
 msgstr "Utilisateur"
 
-#: models/abstract_pfx_base_user.py:90
+#: models/abstract_pfx_base_user.py:92
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -180,27 +180,27 @@ msgstr "séquence"
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "%(model_name)s avec ce/cette %(field_labels)s existe déjà."
 
-#: shortcuts.py:52
+#: shortcuts.py:53
 #, python-brace-format
 msgid "{key} must be an integer number."
 msgstr "{key} doit être un nombre entier."
 
-#: shortcuts.py:68
+#: shortcuts.py:69
 #, python-brace-format
 msgid "{key} must be a number."
 msgstr "{key} doit être un nombre."
 
-#: shortcuts.py:84
+#: shortcuts.py:85
 #, python-brace-format
 msgid "{key} must be a decimal number."
 msgstr "{key} doit être un nombre décimal."
 
-#: shortcuts.py:100
+#: shortcuts.py:101
 #, python-brace-format
 msgid "{key} must be a date."
 msgstr "{key} doit être une date."
 
-#: shortcuts.py:121
+#: shortcuts.py:122
 #, python-brace-format
 msgid "{key} must be “true”, “false”, “1”, “0” or empty."
 msgstr "{key} doit être « true », « false », « 1 », « 0 » ou vide"

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -1,3 +1,5 @@
+from email.utils import formataddr
+
 from django.contrib.auth.models import (
     AbstractBaseUser,
     AbstractUser,
@@ -37,7 +39,7 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     def get_email_rfc(self):
         name = self.get_email_name()
         email = getattr(self, self.get_email_field_name())
-        return f'"{name}" <{email}>'
+        return formataddr((name, email))
 
     def auth_json_repr(self, **kw):
         res = self.json_repr(

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/pfx/pfxcore/shortcuts.py

@@ -2,6 +2,7 @@
 import logging
 from datetime import date
 from decimal import Decimal as D
+from email.utils import formataddr
 from pathlib import Path
 
 from django.core.exceptions import ObjectDoesNotExist
@@ -183,5 +184,5 @@ def default_mail_from():
 def default_mail_from_rfc():
     name, email = default_mail_from()
     if name:
-        return f'"{name}" <{email}>'
+        return formataddr((name, email))
     return email

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests/tests/__init__.py

@@ -10,6 +10,10 @@ from .test_emails_email_api import TestEmailsEmailApi
 from .test_emails_email_model import TestEmailsEmailModel
 from .test_emails_q_mailjet_email_backend import TestEmailsQMailjetEmailBackend
 from .test_emails_send_email_message import TestEmailsSendEmailMessage
+from .test_emails_test_tools import (
+    TestEmailTestMixinWithLocmem,
+    TestMemoryEmailBackend,
+)
 from .test_fields_choices import TestFieldsChoices
 from .test_fields_date import TestFieldsDate
 from .test_fields_decimal import TestFieldsDecimal

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests/tests/test_auth_api.py

@@ -758,8 +758,8 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
 
         # Must send a welcome email
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
-        self.assertEqual(email.to, ['"Isaac Asimov" <isaac.asimov@bu.edu>'])
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
+        self.assertEqual(email.to, ['Isaac Asimov <isaac.asimov@bu.edu>'])
         self.assertEqual(email.subject, f'Welcome on {settings.PFX_SITE_NAME}')
 
         self.client.logout()
@@ -817,9 +817,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         # Must send a reset password email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
         self.assertEqual(email.to, [
-            '"John Ronald Reuel Tolkien" <jrr.tolkien@oxford.com>'])
+            'John Ronald Reuel Tolkien <jrr.tolkien@oxford.com>'])
         self.assertEqual(
             email.subject, f'Password reset on {settings.PFX_SITE_NAME}')
 

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests/tests/test_emails_q_mailjet_email_backend.py

@@ -32,8 +32,8 @@ class TestEmailsQMailjetEmailBackend(TestAssertMixin, TestCase):
         send_mail(
             'This is a test email',
             'This is the mail content.',
-            '"Fred" <from@example.com>',
-            ['"AL" <to@example.com>'],
+            'Fred <from@example.com>',
+            ['AL <to@example.com>'],
             fail_silently=False)
         mail = Email.objects.get(subject='This is a test email')
         self.assertEqual(mail.text_part, 'This is the mail content.')

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests/tests/test_emails_send_email_message.py

@@ -52,6 +52,29 @@ class TestEmailsSendEmailMessage(TestAssertMixin, TestCase):
         self.assertEqual(mail.outbox[0].attachments, [
             ('test.txt', 'A test file content.', 'text/plain')])
 
+    def test_send_email_message_in_memory_attachment(self):
+        att = "test.txt", b"A test file content.", "text/plain"
+
+        send_email_message(
+            'test@example.org', 'base_template',
+            data={'subject': "Test message"}, attachments=[att])
+
+        # Test first message
+        m = mail.outbox[0]
+        self.assertEqual(m.subject, "Test message")
+        self.assertEqual(m.to[0], 'test@example.org')
+        txt_msg = m.body
+        html_msg = m.alternatives[0][0]
+        self.assertIn(
+            '<img src="http://example.org/logo.png" alt="PFX"', html_msg)
+        self.assertIn(
+            'PFX, a DJango rest framework<br />', html_msg)
+        self.assertIn(
+            'PFX, a DJango rest framework', txt_msg)
+
+        self.assertEqual(mail.outbox[0].attachments, [
+            ('test.txt', 'A test file content.', 'text/plain')])
+
     def test_send_email_message_to_formats(self):
 
         send_email_message(
@@ -62,29 +85,29 @@ class TestEmailsSendEmailMessage(TestAssertMixin, TestCase):
             'base_template',
             data={'subject': "Test message"})
         m = mail.outbox[0]
-        self.assertEqual(m.to[0], '"Test User 2" <test2@example.org>')
+        self.assertEqual(m.to[0], 'Test User 2 <test2@example.org>')
 
         send_email_message(
             SimpleNamespace(
-                get_email_rfc=lambda: '"Test 2" <test2@example.org>'),
+                get_email_rfc=lambda: 'Test 2 <test2@example.org>'),
             'base_template',
             data={'subject': "Test message"})
         m = mail.outbox[1]
-        self.assertEqual(m.to[0], '"Test 2" <test2@example.org>')
+        self.assertEqual(m.to[0], 'Test 2 <test2@example.org>')
 
         send_email_message(
-            SimpleNamespace(email_rfc='"Test 1" <test1@example.org>'),
+            SimpleNamespace(email_rfc='Test 1 <test1@example.org>'),
             'base_template',
             data={'subject': "Test message"})
         m = mail.outbox[2]
-        self.assertEqual(m.to[0], '"Test 1" <test1@example.org>')
+        self.assertEqual(m.to[0], 'Test 1 <test1@example.org>')
 
         send_email_message(
-            SimpleNamespace(email_rfc=lambda: '"Test 1" <test1@example.org>'),
+            SimpleNamespace(email_rfc=lambda: 'Test 1 <test1@example.org>'),
             'base_template',
             data={'subject': "Test message"})
         m = mail.outbox[3]
-        self.assertEqual(m.to[0], '"Test 1" <test1@example.org>')
+        self.assertEqual(m.to[0], 'Test 1 <test1@example.org>')
 
         send_email_message(
             SimpleNamespace(email='test3@example.org'),

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests/tests/test_emails_test_tools.py

@@ -30,7 +30,7 @@ class TestMemoryEmailBackend(EmailTestMixin, TestCase):
     def test_outbox_helpers(self):
         send_mail(
             'First', 'Content', 'from@example.com',
-            ['"Jean Dupont" <jean@example.com>', 'paul@example.com'])
+            ['Jean Dupont <jean@example.com>', 'paul@example.com'])
         message = EmailMultiAlternatives(
             'Second', 'Text', 'from@example.com', ['marie@example.com'])
         message.attach_alternative('<p>HTML</p>', 'text/html')
@@ -41,6 +41,9 @@ class TestMemoryEmailBackend(EmailTestMixin, TestCase):
             [first.subject, second.subject], ['First', 'Second'])
         self.assertEqual(
             self.email_to(first), ['jean@example.com', 'paul@example.com'])
+        self.assertEqual(
+            self.email_to_rfc(first),
+            ['Jean Dupont <jean@example.com>', 'paul@example.com'])
         self.assertEqual(self.get_email_html(second), '<p>HTML</p>')
         with self.assertRaises(AssertionError):
             self.get_email_html(first)

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests_base_user/tests/test_auth_api.py

@@ -159,9 +159,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         # Must send a reset password email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
         self.assertEqual(email.to, [
-            '"John Ronald Reuel Tolkien" <jrr.tolkien@oxford.com>'])
+            'John Ronald Reuel Tolkien <jrr.tolkien@oxford.com>'])
         self.assertEqual(
             email.subject, f'Password reset on {settings.PFX_SITE_NAME}')
 

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests_custom_user/tests/test_auth_api.py

@@ -6,7 +6,6 @@ from datetime import timedelta as td
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.core import mail
-# from django.core import mail
 from django.test import TransactionTestCase, override_settings
 from django.utils import timezone as tz
 
@@ -136,7 +135,7 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         # Must send a reset password email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
         self.assertEqual(email.to, ['"jrr.tolkien" <jrr.tolkien@oxford.com>'])
         self.assertEqual(
             email.subject, f'Password reset on {settings.PFX_SITE_NAME}')
@@ -175,7 +174,7 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         # Must send a reset password email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
         self.assertEqual(email.to, ['"jrr.tolkien" <jrr.tolkien@oxford.com>'])
         self.assertEqual(
             email.subject, f'Password reset on {settings.PFX_SITE_NAME}')

{django_pfx-1.7.6.dev27 → django_pfx-1.7.6.dev31}/tests_user_email_login/tests/test_auth_api.py

@@ -136,8 +136,8 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         # Must send a reset password email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
-        self.assertEqual(email.to, ['"JRR Tolkien" <jrr.tolkien@oxford.com>'])
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
+        self.assertEqual(email.to, ['JRR Tolkien <jrr.tolkien@oxford.com>'])
         self.assertEqual(
             email.subject, f'Password reset on {settings.PFX_SITE_NAME}')
 
@@ -175,8 +175,8 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
         # Must send a reset password email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.from_email, '"PFX" <pfx@example.com>')
-        self.assertEqual(email.to, ['"JRR Tolkien" <jrr.tolkien@oxford.com>'])
+        self.assertEqual(email.from_email, 'PFX <pfx@example.com>')
+        self.assertEqual(email.to, ['JRR Tolkien <jrr.tolkien@oxford.com>'])
         self.assertEqual(
             email.subject, f'Password reset on {settings.PFX_SITE_NAME}')
 

django_pfx-1.7.6.dev27/django_pfx.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.7.5",
-  "distance": 27,
-  "node": "g805fe3e9400fc8312cc217f4cd37c07c7024a3ef",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-05"
-}