_parse_headers(): Strip a trailing newline from the envelope header. Closes

SF #951088.

diff --git a/Lib/email/FeedParser.py b/Lib/email/FeedParser.py
index 0bb92712aee4c6f3163a7d13aaf15bbe7aca4577..806277f08210dff88f2cba6cc8afd801a66d5dfb 100644 (file)
--- a/Lib/email/FeedParser.py
+++ b/Lib/email/FeedParser.py
@@ -404,6 +404,10 @@ class FeedParser:
             # Check for envelope header, i.e. unix-from
             if line.startswith('From '):
                 if lineno == 0:
+                    # Strip off the trailing newline
+                    mo = NLCRE_eol.search(line)
+                    if mo:
+                        line = line[:-len(mo.group(0))]
                     self._cur.set_unixfrom(line)
                     continue
                 elif lineno == len(lines) - 1: