merge 3.1

diff --cc Lib/test/support.py
index a9e1b77ce7a5c59166a319561726740f10e37b77,9675df50e943d12a27d4104370c23b445cfd2599..380d5a8dd531acd845ea69f87bb5f927d971e227
--- 1/Lib/test/support.py
--- 2/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -42,9 -32,8 +42,10 @@@ __all__ = 
      "set_memlimit", "bigmemtest", "bigaddrspacetest", "BasicTestRunner",
      "run_unittest", "run_doctest", "threading_setup", "threading_cleanup",
      "reap_children", "cpython_only", "check_impl_detail", "get_attribute",
-     "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink"]
- 
 +    "swap_item", "swap_attr", "requires_IEEE_754",
++    "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
+     "import_fresh_module"
+     ]
  
  class Error(Exception):
      """Base class for regression test exceptions."""