mirror of
https://github.com/nvbn/thefuck.git
synced 2025-03-14 06:38:32 +00:00
Merge 146b463e1d1cdd492d3bce04a10ddc18ca2b7dc7 into c7e7e1d884d3bb241ea6448f72a989434c2a35ec
This commit is contained in:
commit
cbc50a0140
@ -53,6 +53,7 @@ def get_output(script, expanded):
|
||||
"""
|
||||
env = dict(os.environ)
|
||||
env.update(settings.env)
|
||||
log_env = {key: env[key] for key in ['TF_SHELL', 'TF_ALIAS', 'TF_SHELL_ALIASES'] if key in env}
|
||||
|
||||
if six.PY2:
|
||||
expanded = expanded.encode('utf-8')
|
||||
@ -60,7 +61,7 @@ def get_output(script, expanded):
|
||||
split_expand = shlex.split(expanded)
|
||||
is_slow = split_expand[0] in settings.slow_commands if split_expand else False
|
||||
with logs.debug_time(u'Call: {}; with env: {}; is slow: {}'.format(
|
||||
script, env, is_slow)):
|
||||
script, log_env, is_slow)):
|
||||
result = Popen(expanded, shell=True, stdin=PIPE,
|
||||
stdout=PIPE, stderr=STDOUT, env=env)
|
||||
if _wait_output(result, is_slow):
|
||||
|
Loading…
x
Reference in New Issue
Block a user