diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 00:24:26 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 00:24:26 (GMT) |
| commit | 8dc04a4dd1fc0e8c5feaba7308eaf8b8c8df8373 (patch) | |
| tree | 8a4de788c6c22e4d185f43b199735b44607fdf88 /Lib/mailbox.py | |
| parent | 8c7fe2d6f98908a597fec05767dc8a032c06dc61 (diff) | |
| download | cpython-8dc04a4dd1fc0e8c5feaba7308eaf8b8c8df8373.zip cpython-8dc04a4dd1fc0e8c5feaba7308eaf8b8c8df8373.tar.gz cpython-8dc04a4dd1fc0e8c5feaba7308eaf8b8c8df8373.tar.bz2 | |
Merged revisions 77310-77311 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77310 | antoine.pitrou | 2010-01-05 01:22:44 +0200 (Tue, 05 Jan 2010) | 4 lines
Issue #7092: Fix the DeprecationWarnings emitted by the standard library
when using the -3 flag. Patch by Florent Xicluna.
........
r77311 | antoine.pitrou | 2010-01-05 01:28:16 +0200 (Tue, 05 Jan 2010) | 3 lines
Kill a couple of "<>"
........
Diffstat (limited to 'Lib/mailbox.py')
| -rw-r--r-- | Lib/mailbox.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index 7e0689c..8b18010 100644 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -18,7 +18,6 @@ import copy import email import email.message import email.generator -import rfc822 import StringIO try: if sys.platform == 'os2emx': @@ -28,6 +27,13 @@ try: except ImportError: fcntl = None +import warnings +with warnings.catch_warnings(): + if sys.py3kwarning: + warnings.filterwarnings("ignore", ".*rfc822 has been removed", + DeprecationWarning) + import rfc822 + __all__ = [ 'Mailbox', 'Maildir', 'mbox', 'MH', 'Babyl', 'MMDF', 'Message', 'MaildirMessage', 'mboxMessage', 'MHMessage', 'BabylMessage', 'MMDFMessage', 'UnixMailbox', |