envelope 2.0.3__tar.gz → 2.0.4__tar.gz

{envelope-2.0.3 → envelope-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envelope
-Version: 2.0.3
+Version: 2.0.4
 Summary: Insert a message and attachments and send e-mail / sign / encrypt contents by a single line.
 Home-page: https://github.com/CZ-NIC/envelope
 Author: Edvard Rejthar
@@ -9,14 +9,8 @@ License: GNU GPLv3
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE.txt
-Requires-Dist: jsonpickle
-Requires-Dist: python-magic
-Requires-Dist: python-gnupg>=0.5
-Requires-Dist: py3-validate-email; python_version >= "3.8"
-Requires-Dist: py3-validate-email<1.0.6; python_version < "3.8"
 Provides-Extra: smime
-Requires-Dist: M2Crypto; extra == "smime"
+License-File: LICENSE.txt
 
 # Envelope
 
@@ -100,7 +94,7 @@ Envelope.load(path="message.eml").attachments()
 * If planning to use S/MIME, you should ensure some prerequisites: `sudo apt install swig build-essential python3-dev libssl-dev && pip3 install M2Crypto`
 * If planning to send e-mails, prepare SMTP credentials or visit [Configure your SMTP](#configure-your-smtp) tutorial.
 * If your e-mails are to be received outside your local domain, visit [DMARC](#dmarc) section.
-* Package [python-magic](https://pypi.org/project/python-magic/) is used as a dependency. Due to a [well-known](https://github.com/ahupp/python-magic/blob/master/COMPAT.md) name clash with the [file-magic](https://pypi.org/project/file-magic/) package, in case you need to use the latter, don't worry to run `pip uninstall python-magic && pip install file-magic` after installing envelope which is fully compatible with both projects.
+* Package [python-magic](https://pypi.org/project/python-magic/) is used as a dependency. Due to a [well-known](https://github.com/ahupp/python-magic/blob/master/COMPAT.md) name clash with the [file-magic](https://pypi.org/project/file-magic/) package, in case you need to use the latter, don't worry to run `pip uninstall python-magic && pip install file-magic` after installing envelope which is fully compatible with both projects. Both use `libmagic` under the hood which is probably already installed. However, if it is not, [install](https://github.com/ahupp/python-magic?tab=readme-ov-file#installation) `sudo apt install libmagic1`.
 
 ## Bash completion
 1. Run: `apt install bash-completion jq`
@@ -358,7 +352,7 @@ Envelope().attach(path="file.jpg")
   * **attachments**
     * **--attach**: Path to the attachment, followed by optional file name to be used and/or mime type. This parameter may be used multiple times.
     ```bash
-    envelope --attachment "/tmp/file.txt" "displayed-name.txt" "text/plain" --attachment "/tmp/another-file.txt"
+    envelope --attach "/tmp/file.txt" "displayed-name.txt" "text/plain" --attach "/tmp/another-file.txt"
     ```
     * **.attach(attachment=, mimetype=, name=, path=, inline=)**:
         ```python3
@@ -385,7 +379,7 @@ Envelope().attach(path="file.jpg")
     ```
     * **mime**: Sets contents mime subtype: "**auto**" (default), "**html**" or "**plain**" for plain text.
         Maintype is always set to "text".
-        Set maintype to "text".  If a line is longer than 1000 characters, makes the message be transferred safely by bytes (otherwise these non-standard long lines might cause a transferring SMTP server to include line breaks and redundant spaces that might break up ex: DKIM signature).
+        If a line is longer than 1000 characters, makes the message be transferred safely by bytes (otherwise these non-standard long lines might cause a transferring SMTP server to include line breaks and redundant spaces that might break up ex: DKIM signature).
         In case of `Content-Type` header put to the message, **mime** section functionality **is skipped**.
         * **--mime SUBTYPE**
         * **.mime(subtype="auto", nl2br="auto")**

{envelope-2.0.3 → envelope-2.0.4}/README.md

@@ -80,7 +80,7 @@ Envelope.load(path="message.eml").attachments()
 * If planning to use S/MIME, you should ensure some prerequisites: `sudo apt install swig build-essential python3-dev libssl-dev && pip3 install M2Crypto`
 * If planning to send e-mails, prepare SMTP credentials or visit [Configure your SMTP](#configure-your-smtp) tutorial.
 * If your e-mails are to be received outside your local domain, visit [DMARC](#dmarc) section.
-* Package [python-magic](https://pypi.org/project/python-magic/) is used as a dependency. Due to a [well-known](https://github.com/ahupp/python-magic/blob/master/COMPAT.md) name clash with the [file-magic](https://pypi.org/project/file-magic/) package, in case you need to use the latter, don't worry to run `pip uninstall python-magic && pip install file-magic` after installing envelope which is fully compatible with both projects.
+* Package [python-magic](https://pypi.org/project/python-magic/) is used as a dependency. Due to a [well-known](https://github.com/ahupp/python-magic/blob/master/COMPAT.md) name clash with the [file-magic](https://pypi.org/project/file-magic/) package, in case you need to use the latter, don't worry to run `pip uninstall python-magic && pip install file-magic` after installing envelope which is fully compatible with both projects. Both use `libmagic` under the hood which is probably already installed. However, if it is not, [install](https://github.com/ahupp/python-magic?tab=readme-ov-file#installation) `sudo apt install libmagic1`.
 
 ## Bash completion
 1. Run: `apt install bash-completion jq`
@@ -338,7 +338,7 @@ Envelope().attach(path="file.jpg")
   * **attachments**
     * **--attach**: Path to the attachment, followed by optional file name to be used and/or mime type. This parameter may be used multiple times.
     ```bash
-    envelope --attachment "/tmp/file.txt" "displayed-name.txt" "text/plain" --attachment "/tmp/another-file.txt"
+    envelope --attach "/tmp/file.txt" "displayed-name.txt" "text/plain" --attach "/tmp/another-file.txt"
     ```
     * **.attach(attachment=, mimetype=, name=, path=, inline=)**:
         ```python3
@@ -365,7 +365,7 @@ Envelope().attach(path="file.jpg")
     ```
     * **mime**: Sets contents mime subtype: "**auto**" (default), "**html**" or "**plain**" for plain text.
         Maintype is always set to "text".
-        Set maintype to "text".  If a line is longer than 1000 characters, makes the message be transferred safely by bytes (otherwise these non-standard long lines might cause a transferring SMTP server to include line breaks and redundant spaces that might break up ex: DKIM signature).
+        If a line is longer than 1000 characters, makes the message be transferred safely by bytes (otherwise these non-standard long lines might cause a transferring SMTP server to include line breaks and redundant spaces that might break up ex: DKIM signature).
         In case of `Content-Type` header put to the message, **mime** section functionality **is skipped**.
         * **--mime SUBTYPE**
         * **.mime(subtype="auto", nl2br="auto")**

{envelope-2.0.3 → envelope-2.0.4}/envelope/envelope.py

@@ -24,7 +24,7 @@ from os import environ
 from pathlib import Path
 from quopri import decodestring
 from types import GeneratorType
-from typing import Union, List, Set, Optional, Any
+from typing import Literal, Union, List, Set, Optional, Any
 
 from .address import Address
 from .attachment import Attachment
@@ -584,7 +584,7 @@ class Envelope:
             self._subject_encrypted = encrypted
         return self
 
-    def mime(self, subtype=AUTO, nl2br=AUTO):
+    def mime(self, subtype=AUTO, nl2br: Literal["auto"] | bool=AUTO):
         """
         Ignored if `Content-Type` header put to the message.
         @type subtype: str Set contents mime subtype: "auto" (default), "html" or "plain" for plain text.
@@ -951,7 +951,7 @@ class Envelope:
 
         # if we plan to send later, convert text message to the email message object
         email: Optional[Union[str, EmailMessage, Message]] = None
-        if send is not None or html:  # `html` means the user wants a 'multipart/alternative' e-mail message
+        if send is not None or html or self._attachments:  # `html` or attachments means the user needs a 'multipart/...' e-mail message
             email = self._prepare_email(plain, html, encrypt and gpg_on, sign and gpg_on, sign)
             if not email:
                 return

{envelope-2.0.3 → envelope-2.0.4}/envelope/smtp_handler.py

@@ -79,9 +79,9 @@ class SMTPHandler:
             except (timeout_exc, SMTPException) as e:
                 # this connection is gone, reconnect next time
                 del self._instances[self.key]
-                if isinstance(e, SMTPSenderRefused):
+                if isinstance(e, SMTPAuthenticationError):
                     logger.warning(
-                        f"SMTP sender refused, unable to reconnect. {e}")
+                        f"SMTP authentication error, will not re-try. {e}")
                     return False
                 elif isinstance(e, timeout_exc):
                     if self.delay:

{envelope-2.0.3 → envelope-2.0.4}/envelope/utils.py

@@ -3,7 +3,10 @@ from io import TextIOBase, BufferedIOBase
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterable
 
-import magic
+try:
+    import magic
+except ImportError as e:
+    magic = e
 
 if TYPE_CHECKING:
     from .envelope import Envelope
@@ -48,7 +51,8 @@ def get_mimetype(data: bytes = None, path: Path = None):
     """ We support both python-magic and file-magic library, any of them can be on the system. #25
         Their funcionality is the same, their API differs.
     """
-    # XX change to match statement as of Python3.10
+    if isinstance(magic, ImportError):  # user has to install libmagic
+        raise magic
     if hasattr(magic.Magic, "from_file"):  # this is python-magic
         if data:
             return magic.Magic(mime=True).from_buffer(data)

{envelope-2.0.3 → envelope-2.0.4}/envelope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envelope
-Version: 2.0.3
+Version: 2.0.4
 Summary: Insert a message and attachments and send e-mail / sign / encrypt contents by a single line.
 Home-page: https://github.com/CZ-NIC/envelope
 Author: Edvard Rejthar
@@ -9,14 +9,8 @@ License: GNU GPLv3
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE.txt
-Requires-Dist: jsonpickle
-Requires-Dist: python-magic
-Requires-Dist: python-gnupg>=0.5
-Requires-Dist: py3-validate-email; python_version >= "3.8"
-Requires-Dist: py3-validate-email<1.0.6; python_version < "3.8"
 Provides-Extra: smime
-Requires-Dist: M2Crypto; extra == "smime"
+License-File: LICENSE.txt
 
 # Envelope
 
@@ -100,7 +94,7 @@ Envelope.load(path="message.eml").attachments()
 * If planning to use S/MIME, you should ensure some prerequisites: `sudo apt install swig build-essential python3-dev libssl-dev && pip3 install M2Crypto`
 * If planning to send e-mails, prepare SMTP credentials or visit [Configure your SMTP](#configure-your-smtp) tutorial.
 * If your e-mails are to be received outside your local domain, visit [DMARC](#dmarc) section.
-* Package [python-magic](https://pypi.org/project/python-magic/) is used as a dependency. Due to a [well-known](https://github.com/ahupp/python-magic/blob/master/COMPAT.md) name clash with the [file-magic](https://pypi.org/project/file-magic/) package, in case you need to use the latter, don't worry to run `pip uninstall python-magic && pip install file-magic` after installing envelope which is fully compatible with both projects.
+* Package [python-magic](https://pypi.org/project/python-magic/) is used as a dependency. Due to a [well-known](https://github.com/ahupp/python-magic/blob/master/COMPAT.md) name clash with the [file-magic](https://pypi.org/project/file-magic/) package, in case you need to use the latter, don't worry to run `pip uninstall python-magic && pip install file-magic` after installing envelope which is fully compatible with both projects. Both use `libmagic` under the hood which is probably already installed. However, if it is not, [install](https://github.com/ahupp/python-magic?tab=readme-ov-file#installation) `sudo apt install libmagic1`.
 
 ## Bash completion
 1. Run: `apt install bash-completion jq`
@@ -358,7 +352,7 @@ Envelope().attach(path="file.jpg")
   * **attachments**
     * **--attach**: Path to the attachment, followed by optional file name to be used and/or mime type. This parameter may be used multiple times.
     ```bash
-    envelope --attachment "/tmp/file.txt" "displayed-name.txt" "text/plain" --attachment "/tmp/another-file.txt"
+    envelope --attach "/tmp/file.txt" "displayed-name.txt" "text/plain" --attach "/tmp/another-file.txt"
     ```
     * **.attach(attachment=, mimetype=, name=, path=, inline=)**:
         ```python3
@@ -385,7 +379,7 @@ Envelope().attach(path="file.jpg")
     ```
     * **mime**: Sets contents mime subtype: "**auto**" (default), "**html**" or "**plain**" for plain text.
         Maintype is always set to "text".
-        Set maintype to "text".  If a line is longer than 1000 characters, makes the message be transferred safely by bytes (otherwise these non-standard long lines might cause a transferring SMTP server to include line breaks and redundant spaces that might break up ex: DKIM signature).
+        If a line is longer than 1000 characters, makes the message be transferred safely by bytes (otherwise these non-standard long lines might cause a transferring SMTP server to include line breaks and redundant spaces that might break up ex: DKIM signature).
         In case of `Content-Type` header put to the message, **mime** section functionality **is skipped**.
         * **--mime SUBTYPE**
         * **.mime(subtype="auto", nl2br="auto")**

{envelope-2.0.3 → envelope-2.0.4}/setup.py

@@ -21,7 +21,7 @@ long_description = p.read_text() if p.exists() else ""
 
 setup(
     name='envelope',
-    version='2.0.3',
+    version='2.0.4',
     packages=['envelope'],
     author='Edvard Rejthar',
     author_email='edvard.rejthar@nic.cz',

{envelope-2.0.3 → envelope-2.0.4}/envelope.egg-info/requires.txt

@@ -1,6 +1,6 @@
 jsonpickle
-python-magic
 python-gnupg>=0.5
+python-magic
 
 [:python_version < "3.8"]
 py3-validate-email<1.0.6