diff options
author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:40 +0100 |
---|---|---|
committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:40 +0100 |
commit | eff7b513913aa21f41c6e304dcf5178f8bffa980 (patch) | |
tree | d991f365c5fb334ecc08f245aa008943930b83b9 /engine/SCons/compat/_scons_subprocess.py | |
parent | 5652ab4cab956f8426b1bc8d6dd0cc4ecf39f51d (diff) | |
parent | 0de5191eaec0321118254673e8f8414228668818 (diff) |
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'engine/SCons/compat/_scons_subprocess.py')
-rw-r--r-- | engine/SCons/compat/_scons_subprocess.py | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/engine/SCons/compat/_scons_subprocess.py b/engine/SCons/compat/_scons_subprocess.py index 4968825..ccd403a 100644 --- a/engine/SCons/compat/_scons_subprocess.py +++ b/engine/SCons/compat/_scons_subprocess.py @@ -381,7 +381,21 @@ if mswindows: # can't import it. pass import msvcrt - if 0: # <-- change this to use pywin32 instead of the _subprocess driver + try: + # Try to get _subprocess + from _subprocess import * + class STARTUPINFO: + dwFlags = 0 + hStdInput = None + hStdOutput = None + hStdError = None + wShowWindow = 0 + class pywintypes: + error = IOError + except ImportError: + # If not there, then drop back to requiring pywin32 + # TODO: Should this be wrapped in try as well? To notify user to install + # pywin32 ? With URL to it? import pywintypes from win32api import GetStdHandle, STD_INPUT_HANDLE, \ STD_OUTPUT_HANDLE, STD_ERROR_HANDLE @@ -393,20 +407,8 @@ if mswindows: GetExitCodeProcess, STARTF_USESTDHANDLES, \ STARTF_USESHOWWINDOW, CREATE_NEW_CONSOLE from win32event import WaitForSingleObject, INFINITE, WAIT_OBJECT_0 - else: - # 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 - hStdOutput = None - hStdError = None - wShowWindow = 0 - class pywintypes: - error = IOError + + else: import select import errno |