Merge pull request #1611 from mozilla/attachments-as-list-1559

Store attachments as a list
mozilla · Mar 8, 2022 · c9f332e · c9f332e
2 parents 0cb89ff + 56db6a3
commit c9f332e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/emails/utils.py b/emails/utils.py
@@ -134,7 +134,7 @@ def _add_body_to_message(msg, message_body):
 
 def _add_attachments_to_message(msg, attachments):
     # attach attachments
-    for actual_att_name, attachment in attachments.items():
+    for actual_att_name, attachment in attachments:
         # Define the attachment part and encode it using MIMEApplication.
         attachment.seek(0)
         att = MIMEApplication(attachment.read())

diff --git a/emails/views.py b/emails/views.py
@@ -794,15 +794,15 @@ def _get_attachment(part):
 def _get_all_contents(email_message):
     text_content = None
     html_content = None
-    attachments = {}
+    attachments = []
     if email_message.is_multipart():
         for part in email_message.walk():
             try:
                 if part.is_attachment():
                     att_name, att = (
                         _get_attachment(part)
                     )
-                    attachments[att_name] = att
+                    attachments.append((att_name, att))
                     continue
                 if part.get_content_type() == 'text/plain':
                     text_content = part.get_content()