| Index: Lib/httplib.py |
| =================================================================== |
| --- Lib/httplib.py (revision 65979) |
| +++ Lib/httplib.py (working copy) |
| @@ -67,12 +67,13 @@ |
| """ |
| import socket |
| +from sys import py3kwarning |
| from urlparse import urlsplit |
| import warnings |
| -from test.test_support import catch_warning |
| -with catch_warning(record=False): |
| - warnings.filterwarnings("ignore", ".*mimetools has been removed", |
| - DeprecationWarning) |
| +with warnings.catch_warnings(): |
| + if py3kwarning: |
| + warnings.filterwarnings("ignore", ".*mimetools has been removed", |
| + DeprecationWarning) |
| import mimetools |
| try: |
