From 1edcf5bc5f56337593013f0bc8e22ae8c51c3dd8 Mon Sep 17 00:00:00 2001 From: Sabuhi Shukurov Date: Fri, 1 May 2026 15:17:56 +0400 Subject: [PATCH 1/2] refactor: use single underscore for overridable internal methods --- fastapi_mail/fastmail.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fastapi_mail/fastmail.py b/fastapi_mail/fastmail.py index 5bd405b..dd8bc1d 100755 --- a/fastapi_mail/fastmail.py +++ b/fastapi_mail/fastmail.py @@ -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( @@ -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): @@ -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)) From 9b96e129a6b702f26987e817f30bccff994933f7 Mon Sep 17 00:00:00 2001 From: Sabuhi Shukurov Date: Fri, 1 May 2026 15:23:24 +0400 Subject: [PATCH 2/2] fix linter --- fastapi_mail/fastmail.py | 4 ++-- fastapi_mail/msg.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fastapi_mail/fastmail.py b/fastapi_mail/fastmail.py index dd8bc1d..ff66478 100755 --- a/fastapi_mail/fastmail.py +++ b/fastapi_mail/fastmail.py @@ -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 @@ -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) diff --git a/fastapi_mail/msg.py b/fastapi_mail/msg.py index a00e056..2c3a460 100644 --- a/fastapi_mail/msg.py +++ b/fastapi_mail/msg.py @@ -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()