Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions fastapi_mail/fastmail.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ def check_data(data: Union[Dict[Any, Any], str, None, list[Any]]) -> Dict[Any, A
"is an invalid source data type"
)

async def __prepare_message(
async def _prepare_message(
self, message: MessageSchema, template: Optional[Template] = None
) -> Union[EmailMessage, Message]:
if template and message.template_body is not None:
message.template_body = await self.__template_message_builder(
message.template_body = await self._template_message_builder(
message, template
)
msg = MailMsg(message)
sender = await self.__sender(message)
sender = await self._sender(message)
return await msg._message(sender)

async def __prepare_html_and_plain_message(
Expand All @@ -97,10 +97,10 @@ async def __prepare_html_and_plain_message(
message.alternative_body = html

msg = MailMsg(message)
sender = await self.__sender(message)
sender = await self._sender(message)
return await msg._message(sender)

async def __template_message_builder(
async def _template_message_builder(
self, message: MessageSchema, template: Template
) -> str:
if isinstance(message.template_body, list):
Expand All @@ -109,7 +109,7 @@ async def __template_message_builder(
template_data = self.check_data(message.template_body)
return template.render(**template_data)

async def __sender(self, message: MessageSchema) -> Union[EmailStr, str]:
async def _sender(self, message: MessageSchema) -> Union[EmailStr, str]:
sender = message.from_email or self.config.MAIL_FROM
if (from_name := message.from_name or self.config.MAIL_FROM_NAME) is not None:
return formataddr((from_name, sender))
Expand Down Expand Up @@ -176,7 +176,7 @@ async def __prepare_messages_for_sending(
template_obj = await self.get_mail_template(
template_env, template_name
)
prepared = await self.__prepare_message(msg, template_obj)
prepared = await self._prepare_message(msg, template_obj)
else:
if template_env is None:
template_env = self.config.template_engine() # type: ignore
Expand All @@ -192,7 +192,7 @@ async def __prepare_messages_for_sending(
msg, html_template_obj, plain_template_obj
)
else:
prepared = await self.__prepare_message(msg)
prepared = await self._prepare_message(msg)

prepared_messages.append(prepared)

Expand Down
2 changes: 1 addition & 1 deletion fastapi_mail/msg.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ async def attach_file(self, message: MIMEMultipart, attachment: Any):
else:
part = MIMEBase(_maintype="application", _subtype="octet-stream")

await file.seek(0)
await file.seek(0)
part.set_payload(await file.read())
encode_base64(part)
await file.close()
Expand Down