From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 15 Mar 2011 06:13:09 +0000 (-0400)
Subject: merge 141bbcb19c06
X-Git-Tag: v3.2.1b1~301
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de3909da6b8d09b7bcb142994ebd6daba61a23d3;p=thirdparty%2FPython%2Fcpython.git

merge 141bbcb19c06
---

de3909da6b8d09b7bcb142994ebd6daba61a23d3
diff --cc Lib/test/test_subprocess.py
index 5100a207af2e,c2a808c004b8..73f44ad93af4
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@@ -8,13 -8,7 +8,14 @@@ import errn
  import tempfile
  import time
  import re
 +import sysconfig
 +import warnings
 +import select
+ import shutil
 +try:
 +    import gc
 +except ImportError:
 +    gc = None
  
  mswindows = (sys.platform == "win32")