Merge: #17431: Fix missing import of BytesFeedParser in email.parser.

bitdancer · bitdancer · commit 5efee58014d4 · 2013-03-15T20:45:11.000-04:00
diff --git a/Lib/email/parser.py b/Lib/email/parser.py
@@ -9,7 +9,7 @@
 import warnings
 from io import StringIO, TextIOWrapper
 
-from email.feedparser import FeedParser
+from email.feedparser import FeedParser, BytesFeedParser
 from email.message import Message
 from email._policybase import compat32
 
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
@@ -36,6 +36,10 @@
 from test.support import unlink
 from test.test_email import openfile, TestEmailBase
 
+# These imports are documented to work, but we are testing them using a
+# different path, so we import them here just to make sure they are importable.
+from email.parser import FeedParser, BytesFeedParser
+
 NL = '\n'
 EMPTYSTRING = ''
 SPACE = ' '
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -173,6 +173,7 @@ Jan-Hein Bührman
 Dick Bulterman
 Bill Bumgarner
 Jimmy Burgett
+Edmond Burnett
 Tommy Burnette
 Roger Burnham
 Alastair Burt
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -280,6 +280,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #17431: Fix missing import of BytesFeedParser in email.parser.
+
 - Issue #12921: http.server's send_error takes an explain argument to send more
   information in response. Patch contributed by Karl.
 
