Fix parsing of some emails

CHANGELOG.md

@@ -1,3 +1,8 @@
+4.3.1
+-----
+
+- Fix parsing of some emails
+
 4.3.0
 -----
 

parsedmarc/__init__.py

@@ -654,7 +654,7 @@ def parse_report_email(input_, nameservers=None, timeout=2.0):
         msg = email.message_from_string(input_)
 
     except Exception as e:
-        raise ParserError(e.__str__())
+        raise InvalidDMARCReport(e.__str__())
     subject = None
     feedback_report = None
     sample = None

parsedmarc/__version__.py

@@ -2,7 +2,7 @@
 
 import platform
 
-__version__ = "4.3.0"
+__version__ = "4.3.1"
 
 USER_AGENT = "Mozilla/5.0 ((0 {1})) parsedmarc/{2}".format(
             platform.system(),

parsedmarc/utils.py

@@ -403,7 +403,15 @@ def parse_email(data):
             if "date_utc" in received:
                 received["date_utc"] = received["date_utc"].replace("T",
                                                                     " ")
-    parsed_email["from"] = parse_email_address(parsed_email["from"][0])
+
+    if "from" not in parsed_email:
+        if "From" in parsed_email["headers"]:
+            parsed_email["from"] = parsed_email["Headers"]["From"]
+        else:
+            parsed_email["from"] = None
+
+        if parsed_email["from"] is not None:
+            parsed_email["from"] = parse_email_address(parsed_email["from"][0])
 
     if "date" in parsed_email:
         parsed_email["date"] = parsed_email["date"].replace("T", " ")