Default to UTF-8 when no content type header in emails

Author: martinburchell

cardinal_pythonlib/extract_text.py

@@ -1286,7 +1286,10 @@ def _get_email_content(
     if ext is not None and ext in ext_map:
         content = message.get_content()
         if isinstance(content, str):
-            charset = message["Content-Type"].params.get("charset", "utf-8")
+            charset = "utf-8"
+            content_type_header = message.get("Content-Type")
+            if content_type_header:
+                charset = content_type_header.params.get("charset", "utf-8")
             blob = content.encode(charset)
         elif isinstance(content, EmailMessage):
             blob = content.as_bytes()

cardinal_pythonlib/tests/extract_text_tests.py

@@ -440,6 +440,32 @@ def test_eml_with_no_charset_converted(self) -> None:
 
 --===--
 
+"""
+
+        message = message_from_string(content, policy=policy.default)
+        blob = message.as_bytes()
+
+        text = document_to_text(
+            blob=blob, extension=".eml", config=self.config
+        )
+
+        self.assertIn(text_content, text)
+
+    def test_eml_with_no_content_type_converted(self) -> None:
+        text_content = self.fake.paragraph(nb_sentences=10)
+
+        content = f"""From: bar@example.org
+Subject: No content type
+To: foo@example.org
+Mime-Version: 1.0
+Content-Type: multipart/mixed;boundary="==="
+
+--===
+
+{text_content}
+
+--===--
+
 """
 
         message = message_from_string(content, policy=policy.default)