Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

Original patch by Steffen Daode Nurpmeso
This commit is contained in:
R David Murray 2012-03-16 22:46:14 -04:00
parent 9b3d4847e5 1b6c724df0
commit 80e22b56d3
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/email/__init__.py
View File

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

2
Lib/email/feedparser.py
View File

@ -19,7 +19,7 @@ the current message. Defects are just instances that live on the message
object's .defects attribute. object's .defects attribute.
""" """
__all__ = ['FeedParser'] __all__ = ['FeedParser', 'BytesFeedParser']
import re import re

2
Lib/email/generator.py
View File

@ -4,7 +4,7 @@
"""Classes to generate plain text from a message object tree.""" """Classes to generate plain text from a message object tree."""
__all__ = ['Generator', 'DecodedGenerator'] __all__ = ['Generator', 'DecodedGenerator', 'BytesGenerator']
import re import re
import sys import sys

13
Lib/test/test_email/test_email.py
View File

@ -2600,14 +2600,11 @@ class TestMiscellaneous(TestEmailBase):
def test__all__(self): def test__all__(self):
module = __import__('email') module = __import__('email')
# Can't use sorted() here due to Python 2.3 compatibility self.assertEqual(sorted(module.__all__), [
all = module.__all__[:] 'base64mime', 'charset', 'encoders', 'errors', 'feedparser',
all.sort() 'generator', 'header', 'iterators', 'message',
self.assertEqual(all, [ 'message_from_binary_file', 'message_from_bytes',
'base64mime', 'charset', 'encoders', 'errors', 'generator', 'message_from_file', 'message_from_string', 'mime', 'parser',
'header', 'iterators', 'message', 'message_from_binary_file',
'message_from_bytes', 'message_from_file',
'message_from_string', 'mime', 'parser',
'quoprimime', 'utils', 'quoprimime', 'utils',
]) ])