#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 1c931ea..4e96732 100644
--- 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
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index a1ceb7f..6fddd2b 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -38,6 +38,10 @@
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 f02ef23..d8533c4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -156,6 +156,7 @@
Dick Bulterman
Bill Bumgarner
Jimmy Burgett
+Edmond Burnett
Tommy Burnette
Roger Burnham
Alastair Burt
diff --git a/Misc/NEWS b/Misc/NEWS
index fa2f142..cac3957 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,8 @@
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().