Issue #3602

Lib/httplib.py

 """HTTP/1.1 client library
 
 <intro stuff goes here>
 <other stuff, too>
 
 HTTPConnection goes through a number of "states", which define when a client
 may legally make another request or fetch the response for a particular
 request. This diagram details these state transitions:
 
     (null)
@@ skipping 49 matching lines @@
 -------------                  -------            ----------
 Idle                           _CS_IDLE           None
 Request-started                _CS_REQ_STARTED    None
 Request-sent                   _CS_REQ_SENT       None
 Unread-response                _CS_IDLE           <response_class>
 Req-started-unread-response    _CS_REQ_STARTED    <response_class>
 Req-sent-unread-response       _CS_REQ_SENT       <response_class>
 """
 
 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:
     from cStringIO import StringIO
 except ImportError:
     from StringIO import StringIO
 
 __all__ = ["HTTP", "HTTPResponse", "HTTPConnection",
            "HTTPException", "NotConnected", "UnknownProtocol",
            "UnknownTransferEncoding", "UnimplementedFileMode",
@@ skipping 1195 matching lines @@
             print 'status =', status
             print 'reason =', reason
             print "read", len(hs.getfile().read())
             print
             if headers:
                 for header in headers.headers: print header.strip()
             print
 
 if __name__ == '__main__':
     test()