django-codenerix-email 4.0.34__tar.gz → 4.0.36__tar.gz

{django_codenerix_email-4.0.34 → django_codenerix_email-4.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_codenerix_email
-Version: 4.0.34
+Version: 4.0.36
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.34 → django_codenerix_email-4.0.36}/codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.34"
+__version__ = "4.0.36"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

django_codenerix_email-4.0.34/codenerix_email/management/commands/test_email.py → django_codenerix_email-4.0.36/codenerix_email/management/commands/email_test.py

@@ -164,7 +164,7 @@ Django Codenerix Email v{}
 
             if stdout:
                 self.debug(
-                    f"Sending email to {name} <{email}> "
+                    f"Sending email to <{email}> "
                     f"with subject: {email_message.subject}:\n"
                     f"{email_message.body}",
                     color="white",

django_codenerix_email-4.0.34/codenerix_email/management/commands/send_emails.py → django_codenerix_email-4.0.36/codenerix_email/management/commands/emails_send.py

@@ -29,12 +29,10 @@ from codenerix_email.models import EmailMessage
 
 
 class Command(BaseCommand, Debugger):
-
     # Show this when the user types help
     help = "Try to send all emails in the queue"
 
     def add_arguments(self, parser):
-
         # Named (optional) arguments
         parser.add_argument(
             "-d",
@@ -96,7 +94,6 @@ class Command(BaseCommand, Debugger):
         )
 
     def handle(self, *args, **options):
-
         # Get user configuration
         daemon = bool(options["daemon"] or options["d"])
         clear = bool(options["clear"] or options["c"])
@@ -133,7 +130,6 @@ class Command(BaseCommand, Debugger):
         # If daemon mode is requested
         first = True
         while first or daemon:
-
             # Get a bucket of emails
             emails = EmailMessage.objects.filter(
                 sent=False,
@@ -156,7 +152,6 @@ class Command(BaseCommand, Debugger):
 
             # Check if there are emails to process
             if emails:
-
                 # Convert to list
                 list_emails = [x.pk for x in emails]
 
@@ -225,7 +220,6 @@ class Command(BaseCommand, Debugger):
                     ).delete()
 
             elif daemon:
-
                 # Sleep for a while
                 try:
                     time.sleep(10)

django_codenerix_email-4.0.36/codenerix_email/management/commands/recv_emails.py

@@ -0,0 +1,11 @@
+import sys
+
+if not sys.argv[0].startswith("email"):
+    import logging
+
+    logger = logging.getLogger("codenerix")
+    logger.warning(
+        "WARNING: 'recv_emails' is DEPRECATED, switch to 'emails_recv' instead"
+    )
+
+from .emails_recv import *  # type: ignore # noqa

django_codenerix_email-4.0.36/codenerix_email/management/commands/send_emails.py

@@ -0,0 +1,11 @@
+import sys
+
+if not sys.argv[0].startswith("email"):
+    import logging
+
+    logger = logging.getLogger("codenerix")
+    logger.warning(
+        "WARNING: 'send_emails' is DEPRECATED, switch to 'emails_send' instead"
+    )
+
+from .emails_send import *  # type: ignore # noqa

django_codenerix_email-4.0.36/codenerix_email/management/commands/test_email.py

@@ -0,0 +1,11 @@
+import sys
+
+if not sys.argv[0].startswith("email"):
+    import logging
+
+    logger = logging.getLogger("codenerix")
+    logger.warning(
+        "WARNING: 'test_email' is DEPRECATED, switch to 'email_test' instead"
+    )
+
+from .email_test import *  # type: ignore # noqa

{django_codenerix_email-4.0.34 → django_codenerix_email-4.0.36}/codenerix_email/models.py

@@ -21,6 +21,7 @@
 import re
 import ssl
 import smtplib
+import logging
 from uuid import uuid4
 from typing import Optional
 
@@ -55,6 +56,8 @@ BOUNCE_TYPES = (
     (BOUNCE_HARD, _("Hard")),
 )
 
+logger = logging.getLogger("CodenerixEmail:EmailMessage")
+
 
 def ensure_header(headers, key, value, headers_keys=None):
     if headers_keys is None:
@@ -371,13 +374,10 @@ class EmailMessage(CodenerixModel):
         content_subtype=None,
     ):
         # Autoconfigure Debugger
-        if debug:
-            self.set_name("EmailMessage")
-            self.set_debug()
 
         # Warn about subtype
         if content_subtype:
-            self.warning(
+            logger.warning(
                 _(
                     "Programming ERROR: You are using content_subtype, this "
                     "value has been DEPRECATED and will be remove in future "
@@ -389,13 +389,10 @@ class EmailMessage(CodenerixModel):
         if connection is None:
             # Connect
             if not silent or debug:
-                self.warning("Not connected, connecting...")
+                logger.warning("Not connected, connecting...")
             connection = self.connect(legacy)
 
         if self.eto:
-            if debug:
-                self.set_name("EmailMessage->{}".format(self.eto))
-
             # Manually open the connection
             error = None
             try:
@@ -408,7 +405,8 @@ class EmailMessage(CodenerixModel):
                 connection = None
                 exceptiontxt = str(type(e)).split(".")[-1].split("'")[0]
                 ci = getattr(self, "__connect_info", {})
-                error = "{}: {} [HOST={}:{} TLS={}]\n".format(
+                error = "{}-> {}: {} [HOST={}:{} TLS={}]\n".format(
+                    self.eto,
                     exceptiontxt,
                     e,
                     ci.get("host", "-"),
@@ -416,7 +414,7 @@ class EmailMessage(CodenerixModel):
                     ci.get("use_tls", "-"),
                 )
                 if not silent or debug:
-                    self.warning(error)
+                    logger.warning(error)
                 if self.log is None:
                     self.log = ""
                 self.log += f"{error}\n"
@@ -465,16 +463,16 @@ class EmailMessage(CodenerixModel):
                             self.sending = False
                             break
                     except ssl.SSLError as e:
-                        error = f"SSLError: {e}\n"
+                        error = f"{self.eto}: SSLError: {e}\n"
                         if not silent or debug:
-                            self.warning(error)
+                            logger.warning(error)
                         if self.log is None:
                             self.log = ""
                         self.log += f"{error}\n"
                     except smtplib.SMTPServerDisconnected as e:
-                        error = f"SMTPServerDisconnected: {e}\n"
+                        error = f"{self.eto}: SMTPServerDisconnected: {e}\n"
                         if not silent or debug:
-                            self.warning(error)
+                            logger.warning(error)
                         if self.log is None:
                             self.log = ""
                         self.log += f"{error}\n"
@@ -486,16 +484,16 @@ class EmailMessage(CodenerixModel):
                             OSError,
                             TimeoutError,
                         ) as e:
-                            error = f"SMTPServerReconnect: {e}\n"
+                            error = f"{self.eto}: SMTPServerReconnect: {e}\n"
                             if not silent or debug:
-                                self.warning(error)
+                                logger.warning(error)
                             if self.log is None:
                                 self.log = ""
                             self.log += f"{error}\n"
                     except smtplib.SMTPException as e:
-                        error = f"SMTPException: {e}\n"
+                        error = f"{self.eto}: SMTPException: {e}\n"
                         if not silent or debug:
-                            self.warning(error)
+                            logger.warning(error)
                         if self.log is None:
                             self.log = ""
                         self.log += f"{error}\n"

{django_codenerix_email-4.0.34 → django_codenerix_email-4.0.36}/django_codenerix_email.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.34
+Version: 4.0.36
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.34 → django_codenerix_email-4.0.36}/django_codenerix_email.egg-info/SOURCES.txt

@@ -871,6 +871,9 @@ codenerix_email/management/__pycache__/__init__.cpython-311.pyc
 codenerix_email/management/__pycache__/__init__.cpython-35.pyc
 codenerix_email/management/__pycache__/__init__.cpython-39.pyc
 codenerix_email/management/commands/__init__.py
+codenerix_email/management/commands/email_test.py
+codenerix_email/management/commands/emails_recv.py
+codenerix_email/management/commands/emails_send.py
 codenerix_email/management/commands/recv_emails.py
 codenerix_email/management/commands/send_emails.py
 codenerix_email/management/commands/test_email.py
@@ -1613,10 +1616,14 @@ codenerix_email/management/commands/.mypy_cache/3.10/zoneinfo/_tzpath.data.json
 codenerix_email/management/commands/.mypy_cache/3.10/zoneinfo/_tzpath.meta.json
 codenerix_email/management/commands/__pycache__/__init__.cpython-310.pyc
 codenerix_email/management/commands/__pycache__/__init__.cpython-311.pyc
+codenerix_email/management/commands/__pycache__/email_test.cpython-311.pyc
+codenerix_email/management/commands/__pycache__/emails_recv.cpython-311.pyc
+codenerix_email/management/commands/__pycache__/emails_send.cpython-311.pyc
 codenerix_email/management/commands/__pycache__/recv_emails.cpython-310.pyc
 codenerix_email/management/commands/__pycache__/recv_emails.cpython-311.pyc
 codenerix_email/management/commands/__pycache__/send_emails.cpython-311.pyc
 codenerix_email/management/commands/__pycache__/test_email.cpython-310.pyc
+codenerix_email/management/commands/__pycache__/test_email.cpython-311.pyc
 codenerix_email/migrations/0001_initial.py
 codenerix_email/migrations/0002_auto_20170502_1043.py
 codenerix_email/migrations/0003_auto_20170921_1206.py