1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Ref #23919 -- Replaced some os.path usage with pathlib.Path.

This commit is contained in:
Tom
2017-07-21 21:33:26 +01:00
committed by Tim Graham
parent 5d923f2d8c
commit 11b8c30b9e
10 changed files with 54 additions and 57 deletions

View File

@@ -1,5 +1,4 @@
import mimetypes
import os
from email import (
charset as Charset, encoders as Encoders, generator, message_from_string,
)
@@ -13,6 +12,7 @@ from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
from email.utils import formatdate, getaddresses, make_msgid, parseaddr
from io import BytesIO, StringIO
from pathlib import Path
from django.conf import settings
from django.core.mail.utils import DNS_NAME
@@ -333,11 +333,10 @@ class EmailMessage:
as UTF-8. If that fails, set the mimetype to
DEFAULT_ATTACHMENT_MIME_TYPE and don't decode the content.
"""
filename = os.path.basename(path)
with open(path, 'rb') as file:
path = Path(path)
with path.open('rb') as file:
content = file.read()
self.attach(filename, content, mimetype)
self.attach(path.name, content, mimetype)
def _create_message(self, msg):
return self._create_attachments(msg)