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

Initial patch contributed by Edmond Burnett.

diff --git a/Lib/email/parser.py b/Lib/email/parser.py
index 1c931ea9dea95d941ba7309a6bb8af122678243b..4e9673282e1fc31812d87055364df27baae64107 100644 (file)
--- a/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@ -9,7 +9,7 @@ __all__ = ['Parser', 'HeaderParser', 'BytesParser']
 import warnings
 from io import StringIO, TextIOWrapper
 
-from email.feedparser import FeedParser
+from email.feedparser import FeedParser, BytesFeedParser
 from email.message import Message
 
 

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index a1ceb7f1b54cd1e0c4f3bb9ae5c512522a1dacbd..6fddd2b4fc547eef1b282d85a985f83859dbef1b 100644 (file)
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -38,6 +38,10 @@ from email import quoprimime
 from test.support import findfile, run_unittest, unlink
 from email.test import __file__ as landmark
 
+# 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 = ''

diff --git a/Misc/ACKS b/Misc/ACKS
index f02ef234ce27a3400e7cf30abf614bd5e5efd2d4..d8533c4351b206ba504b24e524dc0bc593d8dad5 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -156,6 +156,7 @@ Erik de Bueger
 Dick Bulterman
 Bill Bumgarner
 Jimmy Burgett
+Edmond Burnett
 Tommy Burnette
 Roger Burnham
 Alastair Burt

diff --git a/Misc/NEWS b/Misc/NEWS
index fa2f1423f2bcd20552120c334a748c67c1d39ef3..cac3957fe7899f5ee1610bd22ebf33131ff9e087 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #17431: Fix missing import of BytesFeedParser in email.parser.
+
 - Issue #1285086: Get rid of the refcounting hack and speed up
   urllib.parse.unquote() and urllib.parse.unquote_to_bytes().