Skip to content

Commit d74266d

Browse files
authored
chore: fix mypy errors (#197)
1 parent c15d24e commit d74266d

File tree

6 files changed

+243
-226
lines changed

6 files changed

+243
-226
lines changed

fastapi_mail/email_utils/email_check.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import inspect
22
from abc import ABC, abstractmethod
3-
from typing import Any, Dict, List, Set, Union
3+
from typing import Any, Dict, List, Optional, Set, Union
44

55
import dns.exception
66
import dns.resolver
@@ -86,14 +86,14 @@ class DefaultChecker(AbstractEmailChecker):
8686

8787
def __init__(
8888
self,
89-
source: str = None,
90-
db_provider: str = None,
89+
source: Optional[str] = None,
90+
db_provider: Optional[str] = None,
9191
*,
9292
redis_host: str = "localhost",
9393
redis_port: int = 6379,
9494
redis_db: int = 0,
95-
redis_password: str = None,
96-
username: str = None,
95+
redis_password: Optional[str] = None,
96+
username: Optional[str] = None,
9797
**options: dict,
9898
):
9999

@@ -294,19 +294,25 @@ async def check_mx_record(
294294
async def blocked_email_count(self) -> int:
295295
"""count all blocked emails in redis"""
296296
if self.redis_enabled:
297-
return await self.redis_client.get("email_counter")
297+
result = await self.redis_client.get("email_counter")
298+
if result is not None:
299+
return result
298300
return len(self.BLOCKED_ADDRESSES)
299301

300302
async def blocked_domain_count(self) -> int:
301303
"""count all blocked domains in redis"""
302304
if self.redis_enabled:
303-
return await self.redis_client.get("domain_counter")
305+
result = await self.redis_client.get("domain_counter")
306+
if result is not None:
307+
return result
304308
return len(self.BLOCKED_DOMAINS)
305309

306310
async def temp_email_count(self) -> int:
307311
"""count all temporary emails in redis"""
308312
if self.redis_enabled:
309-
return await self.redis_client.get("temp_counter")
313+
result = await self.redis_client.get("temp_counter")
314+
if result is not None:
315+
return result
310316
return len(self.TEMP_EMAIL_DOMAINS)
311317

312318
async def close_connections(self) -> bool:

fastapi_mail/fastmail.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from contextlib import contextmanager
22
from email.message import EmailMessage, Message
3-
from typing import Any, Dict, Union
3+
from typing import Any, Dict, Optional, Union
44

55
import blinker
66
from jinja2 import Environment, Template
@@ -65,7 +65,7 @@ def check_data(data: Union[Dict[Any, Any], str, None]) -> Dict[Any, Any]:
6565
return data
6666

6767
async def __prepare_message(
68-
self, message: MessageSchema, template: Template = None
68+
self, message: MessageSchema, template: Optional[Template] = None
6969
) -> Union[EmailMessage, Message]:
7070
if template and message.template_body is not None:
7171
message.template_body = await self.__template_message_builder(
@@ -91,7 +91,7 @@ async def __sender(self) -> Union[EmailStr, str]:
9191
return sender
9292

9393
async def send_message(
94-
self, message: MessageSchema, template_name: str = None
94+
self, message: MessageSchema, template_name: Optional[str] = None
9595
) -> None:
9696
if not isinstance(message, MessageSchema):
9797
raise PydanticClassRequired(

fastapi_mail/msg.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from email.mime.multipart import MIMEMultipart
77
from email.mime.text import MIMEText
88
from email.utils import formatdate, make_msgid
9-
from typing import Any, Union
9+
from typing import Any, Optional, Union
1010

1111
from .schemas import MessageType, MultipartSubtypeEnum
1212

@@ -107,7 +107,9 @@ def attach_alternative(self, message: MIMEMultipart) -> MIMEMultipart:
107107
message.attach(tmpmsg)
108108
return message
109109

110-
async def _message(self, sender: str = None) -> Union[EmailMessage, Message]:
110+
async def _message(
111+
self, sender: Optional[str] = None
112+
) -> Union[EmailMessage, Message]:
111113
"""
112114
Creates the email message
113115
"""

0 commit comments

Comments
 (0)