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

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 4ea450fc1bbaaf63ace028dc35317bde657ed6f4,21d1bc30271d135e6607fa74d463f8739965cd75..4cc52a09ed9c09623fe648331cacbb2e6e95d7e4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -280,11 -193,8 +280,13 @@@ Core and Builtin
  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.
 +
 +- Issue #17414: Add timeit, repeat, and default_timer to timeit.__all__.
 +
  - Issue #1285086: Get rid of the refcounting hack and speed up
    urllib.parse.unquote() and urllib.parse.unquote_to_bytes().