From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 16 Mar 2013 00:38:15 +0000 (-0400)
Subject: #17431: Fix missing import of BytesFeedParser in email.parser.
X-Git-Tag: v3.2.4rc1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=612528d95db89c9e728db979c65ed7d774291ba1;p=python

#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 1c931ea9de..4e9673282e 100644
--- a/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@ -9,7 +9,7 @@ __all__ = ['Parser', 'HeaderParser', 'BytesParser']
 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 a1ceb7f1b5..6fddd2b4fc 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -38,6 +38,10 @@ from email import quoprimime
 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 f02ef234ce..d8533c4351 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -156,6 +156,7 @@ Erik de Bueger
 Dick Bulterman
 Bill Bumgarner
 Jimmy Burgett
+Edmond Burnett
 Tommy Burnette
 Roger Burnham
 Alastair Burt
diff --git a/Misc/NEWS b/Misc/NEWS
index fa2f1423f2..cac3957fe7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,8 @@ Core and Builtins
 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().