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

2 files changed, 5 insertions, 1 deletions

diff --git a/Lib/email/parser.py b/Lib/email/parser.py
index 1aab012115..752bf35a6e 100644
--- a/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@ -9,7 +9,7 @@ __all__ = ['Parser', 'HeaderParser', 'BytesParser', 'BytesHeaderParser']
 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
index 23f062fd80..eaed26f844 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -36,6 +36,10 @@ from email import quoprimime
 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 = ' '