summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/email/parser.py2
-rw-r--r--Lib/test/test_email/test_email.py4
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
4 files changed, 8 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 = ' '
diff --git a/Misc/ACKS b/Misc/ACKS
index 65ca31e16b..954206326f 100644
--- 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
index 4ea450fc1b..4cc52a09ed 100644
--- 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.