From: Benjamin Peterson Date: Sun, 8 May 2011 20:35:09 +0000 (-0500) Subject: merge 3.2 X-Git-Tag: v3.3.0a1~2357 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a0792da6ee18f6307172559fe19c7bb935e9ce6;p=python merge 3.2 --- 3a0792da6ee18f6307172559fe19c7bb935e9ce6 diff --cc Lib/test/support.py index e8a5911b97,380d5a8dd5..428595b9c2 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@@ -33,17 -33,19 +33,18 @@@ __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", "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", + "TransientResource", "captured_output", "captured_stdout", "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"] - + "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink", + "import_fresh_module" + ] class Error(Exception): """Base class for regression test exceptions."""