From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 8 May 2011 20:34:24 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31dc3735a5538792c907b796119afd94bc22e19c;p=python

merge 3.1
---

31dc3735a5538792c907b796119afd94bc22e19c
diff --cc Lib/test/support.py
index a9e1b77ce7,9675df50e9..380d5a8dd5
--- a/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",
 +    "swap_item", "swap_attr", "requires_IEEE_754",
-     "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink"]
- 
++    "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
+     "import_fresh_module"
+     ]
  
  class Error(Exception):
      """Base class for regression test exceptions."""