Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: third_party/scons/scons-local/SCons/compat/_scons_subprocess.py

Issue 17024: Update to SCons 1.2.0. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/scons/scons-local/SCons/compat/_scons_subprocess.py
===================================================================
--- third_party/scons/scons-local/SCons/compat/_scons_subprocess.py (revision 7505)
+++ third_party/scons/scons-local/SCons/compat/_scons_subprocess.py (working copy)
@@ -394,7 +394,11 @@
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
« no previous file with comments | « third_party/scons/scons-local/SCons/compat/_scons_itertools.py ('k') | third_party/scons/scons-local/SCons/compat/builtins.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698