mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix prev_is_proxy

Browse source
This commit is contained in:
adam j hartz 2015-05-12 13:54:22 -04:00
parent 915ba1b90e
commit 9323d2446a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xonsh/built_ins.py
View file

@ -424,20 +424,25 @@ def run_subproc(cmds, captured=True):
else:
aliased_cmd = alias + cmd[1:]
# compute stdin for subprocess
prev_is_proxy = isinstance(prev_proc, ProcProxy)
if prev_proc is None:
stdin = None
else:
stdin = prev_proc.stdout
if callable(aliased_cmd):
if len(inspect.signature(aliased_cmd).parameters) == 2:
prev_is_proxy = True
numargs = len(inspect.signature(aliased_cmd).parameters)
if numargs == 2:
cls = SimpleProcProxy
else:
elif numargs == 4:
cls = ProcProxy
else:
e = 'Expected callable with 2 or 4 arguments, not {}'
raise XonshError(e.format(numargs))
proc = cls(aliased_cmd, cmd[1:],
stdin, stdout, None,
universal_newlines=uninew)
else:
prev_is_proxy = False
subproc_kwargs = {}
if os.name == 'posix':
subproc_kwargs['preexec_fn'] = _subproc_pre