diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-09-02 01:25:16 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-09-02 01:25:16 (GMT) |
| commit | 1eaf0742d877fd9d84d6ed82a04bc33b027e9ad0 (patch) | |
| tree | 1c1ee3a5dee04f5f4657b707e9d54ca2e28b1505 /Lib/mimetools.py | |
| parent | 86533776c291c031853609ceaeda96eb2808e4ee (diff) | |
| download | cpython-1eaf0742d877fd9d84d6ed82a04bc33b027e9ad0.zip cpython-1eaf0742d877fd9d84d6ed82a04bc33b027e9ad0.tar.gz cpython-1eaf0742d877fd9d84d6ed82a04bc33b027e9ad0.tar.bz2 | |
Move test.test_support.catch_warning() to the warnings module, rename it
catch_warnings(), and clean up the API.
While expanding the test suite, a bug was found where a warning about the
'line' argument to showwarning() was not letting functions with '*args' go
without a warning.
Closes issue 3602.
Code review by Benjamin Peterson.
Diffstat (limited to 'Lib/mimetools.py')
| -rw-r--r-- | Lib/mimetools.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/mimetools.py b/Lib/mimetools.py index 097eda4..fc5a2a5 100644 --- a/Lib/mimetools.py +++ b/Lib/mimetools.py @@ -2,11 +2,12 @@ import os +import sys import tempfile -from test.test_support import catch_warning -from warnings import filterwarnings -with catch_warning(record=False): - filterwarnings("ignore", ".*rfc822 has been removed", DeprecationWarning) +from warnings import filterwarnings, catch_warnings +with catch_warnings(record=False): + if sys.py3kwarning: + filterwarnings("ignore", ".*rfc822 has been removed", DeprecationWarning) import rfc822 from warnings import warnpy3k |