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

This commit is contained in:
R David Murray 2013-03-15 20:45:11 -04:00
commit 5efee58014
4 changed files with 8 additions and 1 deletions

View file

@ -9,7 +9,7 @@ __all__ = ['Parser', 'HeaderParser', 'BytesParser', 'BytesHeaderParser']
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

View file

@ -36,6 +36,10 @@ from email import quoprimime
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 = ' '

View file

@ -173,6 +173,7 @@ Jan-Hein Bührman
Dick Bulterman
Bill Bumgarner
Jimmy Burgett
Edmond Burnett
Tommy Burnette
Roger Burnham
Alastair Burt

View file

@ -280,6 +280,8 @@ Core and Builtins
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.