Merge #11686: add missing entries to email __all__ lists.
Original patch by Steffen Daode Nurpmeso
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 @@
'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 @@
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
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 08a49f8..e771c20 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2600,14 +2600,11 @@
def test__all__(self):
module = __import__('email')
- # Can't use sorted() here due to Python 2.3 compatibility
- all = module.__all__[:]
- all.sort()
- self.assertEqual(all, [
- 'base64mime', 'charset', 'encoders', 'errors', 'generator',
- 'header', 'iterators', 'message', 'message_from_binary_file',
- 'message_from_bytes', 'message_from_file',
- 'message_from_string', 'mime', 'parser',
+ self.assertEqual(sorted(module.__all__), [
+ 'base64mime', 'charset', 'encoders', 'errors', 'feedparser',
+ 'generator', 'header', 'iterators', 'message',
+ 'message_from_binary_file', 'message_from_bytes',
+ 'message_from_file', 'message_from_string', 'mime', 'parser',
'quoprimime', 'utils',
])