Ticket #24623: 24623_workaround_1.diff

django/core/mail/message.py

@@ -309 +309 @@
     def attach_file(self, path, mimetype=None):
         """Attaches a file from the filesystem."""
         filename = os.path.basename(path)
-        with open(path, 'rb') as f:
+        if not mimetype:
+            mimetype, _ = mimetypes.guess_type(filename)
+        basetype, subtype = mimetype.split('/')
+        readmode = 'r' if basetype == 'text' else 'rb'
+        with open(path, readmode) as f:
             content = f.read()
         self.attach(filename, content, mimetype)