mirror of
https://github.com/nvbn/thefuck.git
synced 2025-04-12 22:00:47 +01:00
25142f81f8
* #833: do not require sudo on TravisCI * #N/A: Add Python dev releases to TravisCI pipeline Inspired by Brett Cannon's advise [1]. 1: https://snarky.ca/how-to-use-your-project-travis-to-help-test-python-itself/ * #837: try and kill proc and its children * #N/A: show shell information on `thefuck --version` * #N/A: omit default arguments to get_close_matches * #842: add settings var to control number of close matches * #N/A: remove `n` from the list of `get_closest`'s args
68 lines
1.8 KiB
Python
68 lines
1.8 KiB
Python
import os
|
|
import shlex
|
|
from subprocess import Popen, PIPE, STDOUT
|
|
from psutil import AccessDenied, Process, TimeoutExpired
|
|
from .. import logs
|
|
from ..conf import settings
|
|
|
|
|
|
def _kill_process(proc):
|
|
"""Tries to kill the process otherwise just logs a debug message, the
|
|
process will be killed when thefuck terminates.
|
|
|
|
:type proc: Process
|
|
|
|
"""
|
|
try:
|
|
proc.kill()
|
|
except AccessDenied:
|
|
logs.debug(u'Rerun: process PID {} ({}) could not be terminated'.format(
|
|
proc.pid, proc.exe()))
|
|
|
|
|
|
def _wait_output(popen, is_slow):
|
|
"""Returns `True` if we can get output of the command in the
|
|
`settings.wait_command` time.
|
|
|
|
Command will be killed if it wasn't finished in the time.
|
|
|
|
:type popen: Popen
|
|
:rtype: bool
|
|
|
|
"""
|
|
proc = Process(popen.pid)
|
|
try:
|
|
proc.wait(settings.wait_slow_command if is_slow
|
|
else settings.wait_command)
|
|
return True
|
|
except TimeoutExpired:
|
|
for child in proc.children(recursive=True):
|
|
_kill_process(child)
|
|
_kill_process(proc)
|
|
return False
|
|
|
|
|
|
def get_output(script, expanded):
|
|
"""Runs the script and obtains stdin/stderr.
|
|
|
|
:type script: str
|
|
:type expanded: str
|
|
:rtype: str | None
|
|
|
|
"""
|
|
env = dict(os.environ)
|
|
env.update(settings.env)
|
|
|
|
is_slow = shlex.split(expanded) in settings.slow_commands
|
|
with logs.debug_time(u'Call: {}; with env: {}; is slow: '.format(
|
|
script, env, is_slow)):
|
|
result = Popen(expanded, shell=True, stdin=PIPE,
|
|
stdout=PIPE, stderr=STDOUT, env=env)
|
|
if _wait_output(result, is_slow):
|
|
output = result.stdout.read().decode('utf-8')
|
|
logs.debug(u'Received output: {}'.format(output))
|
|
return output
|
|
else:
|
|
logs.debug(u'Execution timed out!')
|
|
return None
|