From 1b6c724df01614b446b748c505214afd658e75fe Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 16 Mar 2012 22:43:05 -0400
Subject: [PATCH] #11686: add missing entries to email __all__ lists.

Original patch by Steffen Daode Nurpmeso
---
 Lib/email/__init__.py        |  1 +
 Lib/email/feedparser.py      |  2 +-
 Lib/email/generator.py       |  2 +-
 Lib/email/parser.py          |  2 +-
 Lib/email/test/test_email.py | 13 +++++--------
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Lib/email/__init__.py b/Lib/email/__init__.py
index bd316fdaf38..ff16f6af3f3 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 60a83255c0d..aa8a2ffa644 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 430ee73ea10..04c02101830 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/email/parser.py b/Lib/email/parser.py
index 6caaff53ad4..1c931ea9dea 100644
--- a/Lib/email/parser.py
+++ b/Lib/email/parser.py
@@ -4,7 +4,7 @@
 
 """A parser of RFC 2822 and MIME email messages."""
 
-__all__ = ['Parser', 'HeaderParser']
+__all__ = ['Parser', 'HeaderParser', 'BytesParser']
 
 import warnings
 from io import StringIO, TextIOWrapper
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 5655938021c..5db34dc9d77 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -2518,14 +2518,11 @@ class TestMiscellaneous(TestEmailBase):
 
     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',
             ])