[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/b6a335b9e717
changeset:   69944:b6a335b9e717
parent:      69940:9af64d83c217
parent:      69943:ae6cd69ce9f8
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun May 08 15:35:09 2011 -0500
summary:
  merge 3.2

files:
  Lib/test/support.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -42,8 +42,9 @@
     "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."""

-- 
Repository URL: http://hg.python.org/cpython