diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-23 14:12:18 -0400 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-23 14:12:18 -0400 |
commit | e369471896e79f41084a3c8b97bcd5b6231833e4 (patch) | |
tree | 590548de4dd2caa4f69b89fb4bd02becfa6a34a8 | |
parent | 805a16fb52e3b4cf0edc098c85c959fa2b813426 (diff) | |
parent | 41b640f4fa25d7c8f2527a4f37cdef29cce2dcda (diff) | |
download | scons-e369471896e79f41084a3c8b97bcd5b6231833e4.tar.gz |
Merged in ptomulik/scons (pull request #123)
Fixed "communicate()" interface in Action._subproc() dummyPopen
-rw-r--r-- | src/engine/SCons/Action.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index a6dbb7c6..33d87906 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -679,7 +679,7 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw): # return a dummy Popen instance that only returns error class dummyPopen(object): def __init__(self, e): self.exception = e - def communicate(self): return ('','') + def communicate(self,input=None): return ('','') def wait(self): return -self.exception.errno stdin = None class f(object): |