From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 Jul 2011 20:43:33 +0000 (+0200)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a1~1893
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afed6ecf218c498ecded76fd03519ea9644737f2;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2
---

afed6ecf218c498ecded76fd03519ea9644737f2
diff --cc Lib/test/support.py
index 3dc4bfb10867,2827e8b84230..89ace45c3688
--- a/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 db118ca5a4c6,2a21a7eb5919..7591303d2dd5
--- a/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.