Issue 2247: Don't fail if we can't import a _subprocess module on Windows.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3837 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 86c13fd744715700b1bd6a83e7f6998daf5b8107..d334b64d5d206663d0e0dc3681ff9d7294ca385a 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -18,6 +18,8 @@ RELEASE 1.X - XXX
     - Add a --warn=future-deprecated option for advance warnings about
       deprecated features that still have warnings hidden by default.
 
+    - Don't fail if can't import a _subprocess module on Windows.
+
   From Greg Spencer:
 
     - Support implicit dependency scanning of files encoded in utf-8

diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py
index 4cb9e303286e3fb4db9ebc71528d331edff5f5f3..68d0e4c8506ec43b4a637d6d4be6d1b958211b29 100644 (file)
--- a/src/engine/SCons/compat/_scons_subprocess.py
+++ b/src/engine/SCons/compat/_scons_subprocess.py
@@ -394,7 +394,11 @@ if mswindows:
                                  STARTF_USESHOWWINDOW, CREATE_NEW_CONSOLE
         from win32event import WaitForSingleObject, INFINITE, WAIT_OBJECT_0
     else:
-        from _subprocess import *
+        # SCons:  don't die on Python versions that don't have _subprocess.
+        try:
+            from _subprocess import *
+        except ImportError:
+            pass
         class STARTUPINFO:
             dwFlags = 0
             hStdInput = None