Merge with 3.2 and also remove captured_output from __all__ (see #7960).

diff --cc Lib/test/support.py
index d6f0e0db807bfde1b9b119ba64ff1150d1fa17bd,0cc8c31c07ff96e7853621d5b1c36658be4b5ee6..e49453ebf4828b6259ba13b085f4b8e0b1e460ca
--- 1/Lib/test/support.py
--- 2/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -33,15 -33,17 +33,15 @@@ __all__ = 
      "verbose", "use_resources", "max_memuse", "record_original_stdout",
      "get_original_stdout", "unload", "unlink", "rmtree", "forget",
      "is_resource_enabled", "requires", "find_unused_port", "bind_port",
 -    "fcmp", "is_jython", "TESTFN", "HOST", "FUZZ", "SAVEDCWD", "temp_cwd",
 +    "IPV6_ENABLED", "is_jython", "TESTFN", "HOST", "SAVEDCWD", "temp_cwd",
      "findfile", "sortdict", "check_syntax_error", "open_urlresource",
--    "check_warnings", "CleanImport", "EnvironmentVarGuard",
-     "TransientResource", "captured_output", "captured_stdout", "time_out",
 -    "TransientResource", "captured_output", "captured_stdout",
 -    "captured_stdin", "captured_stderr",
 -    "time_out", "socket_peer_reset", "ioerror_peer_reset",
 -    "run_with_locale", 'temp_umask', "transient_internet",
 -    "set_memlimit", "bigmemtest", "bigaddrspacetest", "BasicTestRunner",
 -    "run_unittest", "run_doctest", "threading_setup", "threading_cleanup",
 -    "reap_children", "cpython_only", "check_impl_detail", "get_attribute",
 -    "swap_item", "swap_attr", "requires_IEEE_754",
++    "check_warnings", "CleanImport", "EnvironmentVarGuard", "TransientResource",
++    "captured_stdout", "captured_stdin", "captured_stderr", "time_out",
 +    "socket_peer_reset", "ioerror_peer_reset", "run_with_locale", 'temp_umask',
 +    "transient_internet", "set_memlimit", "bigmemtest", "bigaddrspacetest",
 +    "BasicTestRunner", "run_unittest", "run_doctest", "threading_setup",
 +    "threading_cleanup", "reap_children", "cpython_only", "check_impl_detail",
 +    "get_attribute", "swap_item", "swap_attr", "requires_IEEE_754",
      "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
      "import_fresh_module"
      ]