From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 16 Mar 2013 00:42:29 +0000 (-0400)
Subject: Merge: #17431: Fix missing import of BytesFeedParser in email.parser.
X-Git-Tag: v3.3.1rc1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8093d6f822133ec552aa32279cd53ea8caa8168e;p=thirdparty%2FPython%2Fcpython.git

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

8093d6f822133ec552aa32279cd53ea8caa8168e
diff --cc Lib/email/parser.py
index 1aab01211536,4e9673282e1f..752bf35a6e11
--- a/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@@ -9,9 -9,8 +9,9 @@@ __all__ = ['Parser', 'HeaderParser', 'B
  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 --cc Lib/test/test_email/test_email.py
index 23f062fd80dd,6fddd2b4fc54..eaed26f844ff
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@@ -33,9 -35,14 +33,13 @@@ from email import iterator
  from email import base64mime
  from email import quoprimime
  
 -from test.support import findfile, run_unittest, unlink
 -from email.test import __file__ as landmark
 +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 = ' '