[Python-checkins] cpython (merge 3.3 -> default): Merge: #17431: Fix missing import of BytesFeedParser in email.parser.

Sat Mar 16 01:46:59 CET 2013

http://hg.python.org/cpython/rev/b7c1ed5ce714
changeset: 82676:b7c1ed5ce714
parent: 82673:46e6a8b742d9
parent: 82675:45f6925906bf
user: R David Murray <rdmurray at bitdance.com>
date: Fri Mar 15 20:45:11 2013 -0400
summary:
 Merge: #17431: Fix missing import of BytesFeedParser in email.parser.
files:
 Lib/email/parser.py | 2 +-
 Lib/test/test_email/test_email.py | 4 ++++
 Misc/ACKS | 1 +
 Misc/NEWS | 2 ++
 4 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Lib/email/parser.py b/Lib/email/parser.py
--- a/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@ -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 --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -36,6 +36,10 @@
 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -173,6 +173,7 @@
 Dick Bulterman
 Bill Bumgarner
 Jimmy Burgett
+Edmond Burnett
 Tommy Burnette
 Roger Burnham
 Alastair Burt
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -280,6 +280,8 @@
 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.
 
-- 
Repository URL: http://hg.python.org/cpython
