diff -r 46e6a8b742d9 Lib/email/parser.py --- a/Lib/email/parser.py Fri Mar 15 16:51:21 2013 -0400 +++ b/Lib/email/parser.py Fri Mar 15 16:07:05 2013 -0700 @@ -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 from email._policybase import compat32 diff -r 46e6a8b742d9 Misc/ACKS --- a/Misc/ACKS Fri Mar 15 16:51:21 2013 -0400 +++ b/Misc/ACKS Fri Mar 15 16:07:05 2013 -0700 @@ -1360,4 +1360,4 @@ Kai Zhu Tarek Ziadé Peter Åstrand - +Edmond Burnett diff -r 46e6a8b742d9 Misc/NEWS --- a/Misc/NEWS Fri Mar 15 16:51:21 2013 -0400 +++ b/Misc/NEWS Fri Mar 15 16:07:05 2013 -0700 @@ -280,6 +280,9 @@ Library ------- +- Issue #17431: Fix missing import of BytesFeedParser from email.parser. Patch + by Edmond Burnett. + - Issue #12921: http.server's send_error takes an explain argument to send more information in response. Patch contributed by Karl.