merge 141bbcb19c06

diff --cc Lib/test/test_subprocess.py
index 5100a207af2ee2eeac7a1d986386a1021d37e026,c2a808c004b86bb5121a14f443946d53661179d8..73f44ad93af485e2646a397196dad023287cabd7
--- 1/Lib/test/test_subprocess.py
--- 2/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")