Browse Source

Merge #11686: add missing entries to email __all__ lists.

Original patch by Steffen Daode Nurpmeso
pull/2332/head
R David Murray 14 years ago
parent
commit
80e22b56d3
  1. 1
      Lib/email/__init__.py
  2. 2
      Lib/email/feedparser.py
  3. 2
      Lib/email/generator.py
  4. 13
      Lib/test/test_email/test_email.py

1
Lib/email/__init__.py

@ -11,6 +11,7 @@ __all__ = [
'charset',
'encoders',
'errors',
'feedparser',
'generator',
'header',
'iterators',

2
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

2
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

13
Lib/test/test_email/test_email.py

@ -2600,14 +2600,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',
])

Loading…
Cancel
Save