mailsuite 2.3.0__tar.gz → 2.3.2__tar.gz

{mailsuite-2.3.0 → mailsuite-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mailsuite
-Version: 2.3.0
+Version: 2.3.2
 Summary: A Python package for retrieving, parsing, and sending emails
 Project-URL: Homepage, https://github.com/seanthegeek/mailsuite/
 Project-URL: Documentation, https://seanthegeek.net/mailsuite/
@@ -28,7 +28,7 @@ Requires-Dist: dkimpy>=1.1.0
 Requires-Dist: dnspython>=2.0.0
 Requires-Dist: expiringdict==1.2.2
 Requires-Dist: html2text>=2020.1.16
-Requires-Dist: imapclient>=3.1.0
+Requires-Dist: imapclient>=4.0.0
 Requires-Dist: mail-parser>=4.6.2
 Requires-Dist: publicsuffix2>=2.20190812
 Provides-Extra: all

{mailsuite-2.3.0 → mailsuite-2.3.2}/mailsuite/__init__.py

@@ -1,3 +1,3 @@
 """A Python package to simplify receiving, parsing, and sending email"""
 
-__version__ = "2.3.0"
+__version__ = "2.3.2"

{mailsuite-2.3.0 → mailsuite-2.3.2}/mailsuite/utils.py

@@ -361,8 +361,10 @@ def parse_email(
 
     _parsed_email = mailparser.parse_from_string(data_str)
     parsed_email = _parsed_email.mail
-    if isinstance(parsed_email, str):
-        raise ValueError("Not an email")  # noqa: TRY004
+    # mail-parser <=4.6.1 returns the input string for unparseable input;
+    # 4.6.2+ returns a dict with no headers instead.
+    if isinstance(parsed_email, str) or not _parsed_email.headers:
+        raise ValueError("Not an email")
     headers_str = re.split(r"(\n|\r\n){2,}", data_str)[0]
     parsed_email["raw_headers"] = headers_str
     headers_str = re.sub(r"(\n|\r\n)\s+", " ", headers_str)
@@ -400,7 +402,10 @@ def parse_email(
             parsed_email[header] = [parse_email_address(x) for x in email.utils.getaddresses([_headers[header]])]
     from_domain = None
     if "from" in parsed_email:
-        if "domain" in parsed_email["from"]:
+        if (
+            parsed_email["from"] is not None
+            and "domain" in parsed_email["from"]
+        ):
             from_domain = parsed_email["from"]["domain"]
         else:
             logger.warning("Message from header could not be parsed")

{mailsuite-2.3.0 → mailsuite-2.3.2}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "dnspython>=2.0.0",
     "expiringdict==1.2.2",
     "html2text>=2020.1.16",
-    "IMAPClient>=3.1.0",
+    "IMAPClient>=4.0.0",
     "mail-parser>=4.6.2",
     "publicsuffix2>=2.20190812",
 ]