+MailAttachment.__str__, fix MailMessage.text,html

Author: ikvk

README.rst

@@ -20,7 +20,7 @@ High level lib for work with email by IMAP:
 .. image:: https://img.shields.io/pypi/dm/imap_tools.svg?style=social
 
 ===============  ================================================================================================
-Python version   3.5+
+Python version   3.8+
 License          Apache-2.0
 PyPI             https://pypi.python.org/pypi/imap_tools/
 RFC              `IMAP4.1 <https://tools.ietf.org/html/rfc3501>`_,

docs/release_notes.rst

@@ -1,3 +1,10 @@
+1.9.0
+=====
+* Added: __str__ to MailAttachment
+* Fixed: MailMessage.text parser - text with inline attachments case
+* Fixed: MailMessage.html parser - html with inline attachments case
+* Dropped: support py3.3,py3.4,py3.5,py3.6,py3.7
+
 1.8.0
 =====
 * Added: BaseMailBox.numbers_to_uids - Get message uids by message numbers

imap_tools/__init__.py

@@ -11,4 +11,4 @@
 from .utils import EmailAddress
 from .errors import *
 
-__version__ = '1.8.0'
+__version__ = '1.9.0'

imap_tools/consts.py

@@ -1,11 +1,14 @@
 import re
+import sys
 
 SHORT_MONTH_NAMES = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec')
 
 UID_PATTERN = re.compile(r'(^|\s+|\W)UID\s+(?P<uid>\d+)')
 
 CODECS_OFFICIAL_REPLACEMENT_CHAR = '�'
 
+PYTHON_VERSION_MINOR = int(sys.version_info.minor)
+
 
 class MailMessageFlags:
     """

imap_tools/mailbox.py

@@ -1,5 +1,4 @@
 import re
-import sys
 import imaplib
 import datetime
 from collections import UserString
@@ -8,7 +7,7 @@
 from .message import MailMessage
 from .folder import MailBoxFolderManager
 from .idle import IdleManager
-from .consts import UID_PATTERN
+from .consts import UID_PATTERN, PYTHON_VERSION_MINOR
 from .utils import clean_uids, check_command_status, chunks, encode_folder, clean_flags, check_timeout_arg_support, \
     chunks_crop
 from .errors import MailboxStarttlsError, MailboxLoginError, MailboxLogoutError, MailboxNumbersError, \
@@ -21,8 +20,6 @@
 
 Criteria = Union[AnyStr, UserString]
 
-PYTHON_VERSION_MINOR = sys.version_info.minor
-
 
 class BaseMailBox:
     """Working with the email box"""

imap_tools/message.py

@@ -178,24 +178,26 @@ def date(self) -> datetime.datetime:
     @lru_cache()
     def text(self) -> str:
         """Plain text of the mail message"""
+        results = []
         for part in self.obj.walk():
             if part.get_content_maintype() == 'multipart' or part.get_filename():
                 continue
             if part.get_content_type() in ('text/plain', 'text/'):
-                return decode_value(part.get_payload(decode=True), part.get_content_charset())
-        return ''
+                results.append(decode_value(part.get_payload(decode=True), part.get_content_charset()))
+        return ''.join(results)
 
     @property
     @lru_cache()
     def html(self) -> str:
         """HTML text of the mail message"""
+        results = []
         for part in self.obj.walk():
             if part.get_content_maintype() == 'multipart' or part.get_filename():
                 continue
             if part.get_content_type() == 'text/html':
                 html = decode_value(part.get_payload(decode=True), part.get_content_charset())
-                return replace_html_ct_charset(html, 'utf-8')
-        return ''
+                results.append(replace_html_ct_charset(html, 'utf-8'))
+        return ''.join(results)
 
     @property
     @lru_cache()
@@ -233,6 +235,9 @@ class MailAttachment:
     def __init__(self, part):
         self.part = part
 
+    def __str__(self):
+        return '<{} | {} | {} | {}>'.format(self.filename, self.content_type, self.content_disposition, self.content_id)
+
     @property
     @lru_cache()
     def filename(self) -> str:

imap_tools/query.py

@@ -86,7 +86,7 @@ def __init__(
             all: Optional[bool] = None,  # noqa
             uid: Optional[Union[str, Iterable[str], UidRange]] = None,
             header: Optional[Union[Header, List[Header]]] = None,
-            gmail_label: Optional[Union[str, List[str]]] = None):  # todo newline after drop 3.5
+            gmail_label: Optional[Union[str, List[str]]] = None):
         self.converted_strings = converted_strings
         for val in converted_strings:
             if not any(isinstance(val, t) for t in (str, UserString)):

imap_tools/utils.py

@@ -205,7 +205,13 @@ def replace_html_ct_charset(html: str, new_charset: str) -> str:
     meta_ct_match = re.search(r'<\s*meta .*?content-type.*?>', html, re.IGNORECASE | re.DOTALL)
     if meta_ct_match:
         meta = meta_ct_match.group(0)
-        meta_new = re.sub(r'charset\s*=\s*[a-zA-Z0-9_:.+-]+', 'charset={}'.format(new_charset), meta, 1, re.IGNORECASE)
+        meta_new = re.sub(
+            pattern=r'charset\s*=\s*[a-zA-Z0-9_:.+-]+',
+            repl='charset={}'.format(new_charset),
+            string=meta,
+            count=1,
+            flags=re.IGNORECASE
+        )
         html = html.replace(meta, meta_new)
     return html
 

tests/messages_data/address_quoted_newlines.py

@@ -8,7 +8,7 @@
     cc=('third.name@domain.com', 'quoted-mailing-list-one@domain.com', 'quoted-mailing-list-two@domain.com'),
     bcc=('my.name@domain.com', 'list1-one-name@domain.com', 'list2-second-name@domain.com'),
     reply_to=(),
-    date=datetime.datetime(2020, 11, 1, 14, 49, 7, tzinfo=datetime.timezone(datetime.timedelta(-1, 57600))),
+    date=datetime.datetime(2020, 11, 1, 14, 49, 7, tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=57600))),
     date_str='Mon, 01 Nov 2020 14:49:07 -0800 (PST)',
     text='Daily Data: D09.ZPH (Averaged data)\nEmail generated: 10/11/2020 00:04:03.765\nEmail sent: 10/11/2020 00:49:03.125',
     html='',

tests/messages_data/att_name_in_content_type.py

@@ -8,7 +8,7 @@
     cc=(),
     bcc=(),
     reply_to=(),
-    date=datetime.datetime(2020, 11, 9, 14, 49, 7, tzinfo=datetime.timezone(datetime.timedelta(-1, 57600))),
+    date=datetime.datetime(2020, 11, 9, 14, 49, 7, tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=57600))),
     date_str='Mon, 09 Nov 2020 14:49:07 -0800 (PST)',
     text='Daily Data: D09.ZPH (Averaged data)\nEmail generated: 10/11/2020 00:04:03.765\nEmail sent: 10/11/2020 00:49:03.125',
     html='',