Issue #3602

Lib/cgi.py

 #! /usr/local/bin/python
 
 # NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
 # intentionally NOT "/usr/bin/env python".  On many systems
 # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
 # scripts, and /usr/local/bin is the default directory where Python is
 # installed, so /usr/bin/env would be unable to find python.  Granted,
 # binary installations by Linux vendors often install Python in
 # /usr/bin.  So let those vendors patch cgi.py to match their choice
 # of installation.
@@ skipping 21 matching lines @@
 
 
 # Imports
 # =======
 
 from operator import attrgetter
 import sys
 import os
 import urllib
 import UserDict
-from test.test_support import catch_warning
-from warnings import filterwarnings
-with catch_warning(record=False):
-    filterwarnings("ignore", ".*mimetools has been removed",
-                    DeprecationWarning)
+from warnings import filterwarnings, catch_warnings
+with catch_warnings():
+    if sys.py3kwarning:
+        filterwarnings("ignore", ".*mimetools has been removed",
+                        DeprecationWarning)
     import mimetools
-    filterwarnings("ignore", ".*rfc822 has been removed", DeprecationWarning)
+    if sys.py3kwarning:
+        filterwarnings("ignore", ".*rfc822 has been removed", DeprecationWarning)
     import rfc822
 
 try:
     from cStringIO import StringIO
 except ImportError:
     from StringIO import StringIO
 
 __all__ = ["MiniFieldStorage", "FieldStorage", "FormContentDict",
            "SvFormContentDict", "InterpFormContentDict", "FormContent",
            "parse", "parse_qs", "parse_qsl", "parse_multipart",
@@ skipping 1019 matching lines @@
 def valid_boundary(s, _vb_pattern="^[ -~]{0,200}[!-~]$"):
     import re
     return re.match(_vb_pattern, s)
 
 # Invoke mainline
 # ===============
 
 # Call test() when this file is run as a script (not imported as a module)
 if __name__ == '__main__':
     test()