mypy compatible components

conftest.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from unittest.mock import Mock, patch
+from unittest.mock import Mock
 
 import pytest
 

src/nomail/__init__.py

@@ -2,14 +2,14 @@
 
 from .action import ActionNone
 from .email_filter import ListFilter
-from .session import noop
+from .session import run
 
 __version__ = version("nomail")
 
 
 def filter(rate_limit: int = 1):
     blacklist = get_blacklist()
-    emails = session.run(ActionNone(), ListFilter(blacklist), rate_limit)
+    emails = run(ActionNone(), ListFilter(blacklist), rate_limit)
     print_summary(emails)
 
 

src/nomail/email.py

@@ -3,7 +3,7 @@
 
 import pandas as pd
 
-from . import descriptor, sanitize
+from . import sanitize
 
 
 class Email:

src/nomail/email_filter.py

@@ -1,10 +1,10 @@
-from typing import List
+from typing import List, Optional
 
 from .email import Email
 
 
 class ListFilter():
-    def __init__(self, address_list: List[str] = None):
+    def __init__(self, address_list: Optional[List[str]] = None):
         if address_list is None:
             address_list = []
         self._address_list = address_list

src/nomail/imap.py

@@ -1,6 +1,7 @@
 import email
 import imaplib
-from typing import List, Optional
+from typing import List
+from email.message import Message
 
 from .env import CREDENTIALS, PROVIDER
 from .util import split_bytes
@@ -11,7 +12,7 @@ class Imap():
     def __init__(self):
         try:
             self._imap = imaplib.IMAP4_SSL(PROVIDER)
-        except ConnectionRefusedError as e:
+        except ConnectionRefusedError:
             print("couldn't connect to imap email server")
             print("this is most likely due to incorrect credentials, check your env file")
             return
@@ -22,16 +23,16 @@ def __init__(self):
         self._imap.login(*CREDENTIALS)
         self._imap.select()
 
-    def get_msgs(self) -> List[str]:
+    def get_msgs(self) -> List[Message]:
         return [self.get_msg_data(uid) for uid in self.get_uids()]
 
-    def get_msg_data(self, uid: int) -> str:
+    def get_msg_data(self, uid: bytes) -> Message:
         return email.message_from_bytes(self.fetch_msg_from_server(uid))
 
-    def fetch_msg_from_server(self, uid: int) -> bytes:
+    def fetch_msg_from_server(self, uid: bytes) -> bytes:
         return self._imap.fetch(uid, "(RFC822)")[1][0][1]
 
-    def get_uids(self) -> List[int]:
+    def get_uids(self) -> List[bytes]:
         return split_bytes(self.fetch_uids_from_server())
 
     def fetch_uids_from_server(self) -> bytes:

src/nomail/session.py

@@ -1,4 +1,3 @@
-from typing import Optional
 
 from .action import Action
 from .adapter import EmailImapAdapter

src/nomail/util.py

@@ -1,6 +1,9 @@
-def split_bytes(byte_str: bytes) -> list[bytes]:
+from typing import List
+
+
+def split_bytes(byte_str: bytes) -> List[bytes]:
     return byte_str.split(b' ') if byte_str else []
 
 
-def to_int(collection):
+def to_int(collection) -> List[int]:
     return [int(item) for item in collection]

tests/unit/email_filter_test.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from nomail.email_filter import ListFilter
+from nomail.filter import EmailFilterList
 
 
 def email_mock_factory(sender):

tests/unit/email_test.py

@@ -1,9 +1,8 @@
 from datetime import datetime
 from unittest.mock import patch
 
-import pandas as pd
 
-from nomail.email import Email, EmailList
+from nomail.email import Email
 
 
 @patch("nomail.email.sanitize")