[Python-checkins] cpython (3.2): #17431: Fix missing import of BytesFeedParser in email.parser.

[r.david.murray]

http://hg.python.org/cpython/rev/4e6cf15e55c1
changeset:   82674:4e6cf15e55c1
branch:      3.2
parent:      82671:4be7f8da7adf
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Mar 15 20:38:15 2013 -0400
summary:
  #17431: Fix missing import of BytesFeedParser in email.parser.

Initial patch contributed by Edmond Burnett.

files:
  Lib/email/parser.py          |  2 +-
  Lib/email/test/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
 
 
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -38,6 +38,10 @@
 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -156,6 +156,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
@@ -233,6 +233,8 @@
 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().
 

-- 
Repository URL: http://hg.python.org/cpython