Merge from 3.2

diff --cc Lib/test/support.py
index 3dc4bfb10867fa54c30565eec4a4fd59ac0437a6,2827e8b84230e7209921afa16d6bfbaf1ad14fea..89ace45c368899932888a8fcf9bd3298b6c207c2
--- 1/Lib/test/support.py
--- 2/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -24,15 -24,16 +24,21 @@@ import sysconfi
  import logging.handlers
  
  try:
-     import _thread
+     import _thread, threading
  except ImportError:
      _thread = None
+     threading = None
+ try:
+     import multiprocessing.process
+ except ImportError:
+     multiprocessing = None
+ 
  
 +try:
 +    import zlib
 +except ImportError:
 +    zlib = None
 +
  __all__ = [
      "Error", "TestFailed", "ResourceDenied", "import_module",
      "verbose", "use_resources", "max_memuse", "record_original_stdout",

diff --cc Lib/test/test_pydoc.py
index db118ca5a4c6e9a16b85a613ce5079aea4f38c8e,2a21a7eb591916576d66f2170e3c696ade0aa1d1..7591303d2dd5818cc7fd174ff7e1955b9b7aff06
--- 1/Lib/test/test_pydoc.py
--- 2/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@@ -197,9 -200,9 +200,9 @@@ war</tt></dd></dl
  missing_pattern = "no Python documentation found for '%s'"
  
  # output pattern for module with bad imports
 -badimport_pattern = "problem in %s - ImportError: No module named %s"
 +badimport_pattern = "problem in %s - ImportError: No module named %r"
  
- def run_pydoc(module_name, *args):
+ def run_pydoc(module_name, *args, **env):
      """
      Runs pydoc on the specified module. Returns the stripped
      output of pydoc.