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

diff --cc Lib/email/parser.py
index 1aab0121153606017f1a31e95374becdd93826b0,4e9673282e1fc31812d87055364df27baae64107..752bf35a6e11e57b0abf0f7ad4a37a6fb096f2e6
--- 1/Lib/email/parser.py
--- 2/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@@ -9,9 -9,8 +9,9 @@@ __all__ = ['Parser', 'HeaderParser', 'B
  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
  
  
  \f

diff --cc Lib/test/test_email/test_email.py
index 23f062fd80ddf8fa365ac5ff00a4c128c7dd575e,6fddd2b4fc547eef1b282d85a985f83859dbef1b..eaed26f844ff3da7e1af5c31965c32b13c62ab5b
--- 1/Lib/test/test_email/test_email.py
--- 2/Lib/email/test/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@@ -33,9 -35,14 +33,13 @@@ from email import iterator
  from email import base64mime
  from email import quoprimime
  
 -from test.support import findfile, run_unittest, unlink
 -from email.test import __file__ as landmark
 +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 --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
Simple merge