summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-17 02:46:14 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-03-17 02:46:14 (GMT)
commit80e22b56d3efdf2351307de6c6706ebed934fe7a (patch)
tree4e8b2bdca2acdf526db90737b29c0b7a0bdb0353 /Lib/email
parent9b3d4847e5e555ef4bab130969639d54ec78cf0e (diff)
parent1b6c724df01614b446b748c505214afd658e75fe (diff)
downloadcpython-80e22b56d3efdf2351307de6c6706ebed934fe7a.zip
cpython-80e22b56d3efdf2351307de6c6706ebed934fe7a.tar.gz
cpython-80e22b56d3efdf2351307de6c6706ebed934fe7a.tar.bz2
Merge #11686: add missing entries to email __all__ lists.
Original patch by Steffen Daode Nurpmeso
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/__init__.py1
-rw-r--r--Lib/email/feedparser.py2
-rw-r--r--Lib/email/generator.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/Lib/email/__init__.py b/Lib/email/__init__.py
index bd316fd..ff16f6a 100644
--- a/Lib/email/__init__.py
+++ b/Lib/email/__init__.py
@@ -11,6 +11,7 @@ __all__ = [
'charset',
'encoders',
'errors',
+ 'feedparser',
'generator',
'header',
'iterators',
diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py
index e754d89..533ebdf 100644
--- a/Lib/email/feedparser.py
+++ b/Lib/email/feedparser.py
@@ -19,7 +19,7 @@ the current message. Defects are just instances that live on the message
object's .defects attribute.
"""
-__all__ = ['FeedParser']
+__all__ = ['FeedParser', 'BytesFeedParser']
import re
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index edba13f..dcfea4c 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -4,7 +4,7 @@
"""Classes to generate plain text from a message object tree."""
-__all__ = ['Generator', 'DecodedGenerator']
+__all__ = ['Generator', 'DecodedGenerator', 'BytesGenerator']
import re
import sys