Commit 5efee580 authored by R David Murray's avatar R David Murray

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

parents b0dc5c3b 8093d6f8
...@@ -9,7 +9,7 @@ __all__ = ['Parser', 'HeaderParser', 'BytesParser', 'BytesHeaderParser'] ...@@ -9,7 +9,7 @@ __all__ = ['Parser', 'HeaderParser', 'BytesParser', 'BytesHeaderParser']
import warnings import warnings
from io import StringIO, TextIOWrapper from io import StringIO, TextIOWrapper
from email.feedparser import FeedParser from email.feedparser import FeedParser, BytesFeedParser
from email.message import Message from email.message import Message
from email._policybase import compat32 from email._policybase import compat32
......
...@@ -36,6 +36,10 @@ from email import quoprimime ...@@ -36,6 +36,10 @@ from email import quoprimime
from test.support import unlink from test.support import unlink
from test.test_email import openfile, TestEmailBase 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' NL = '\n'
EMPTYSTRING = '' EMPTYSTRING = ''
SPACE = ' ' SPACE = ' '
......
...@@ -173,6 +173,7 @@ Jan-Hein Bührman ...@@ -173,6 +173,7 @@ Jan-Hein Bührman
Dick Bulterman Dick Bulterman
Bill Bumgarner Bill Bumgarner
Jimmy Burgett Jimmy Burgett
Edmond Burnett
Tommy Burnette Tommy Burnette
Roger Burnham Roger Burnham
Alastair Burt Alastair Burt
......
...@@ -280,6 +280,8 @@ Core and Builtins ...@@ -280,6 +280,8 @@ Core and Builtins
Library 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 - Issue #12921: http.server's send_error takes an explain argument to send more
information in response. Patch contributed by Karl. information in response. Patch contributed by Karl.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment