]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sun, 8 May 2011 20:35:09 +0000 (15:35 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 8 May 2011 20:35:09 +0000 (15:35 -0500)
1  2 
Lib/test/support.py

index e8a5911b97aea86bea1f7288f2de0950e25fc81f,380d5a8dd531acd845ea69f87bb5f927d971e227..428595b9c2003cf97c83060d5110cd74833f4dd4
@@@ -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."""