MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-20 01:28:56 +00:00
Code Issues Releases Wiki Activity

Add: Copy same code for older version, but with stderr.

Browse Source
This commit is contained in:
ik1ne 2019-08-02 12:57:12 +09:00
parent 01a5ba99d0
commit c8aebd887e
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
thefuck/rules/docker_not_command.py
View File

@ -12,12 +12,25 @@ def match(command):
def get_docker_commands(): def get_docker_commands():
proc = subprocess.Popen('docker', stdout=subprocess.PIPE) proc = subprocess.Popen('docker', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
lines = [line.decode('utf-8') for line in proc.stdout.readlines()] lines = proc.stdout.readlines()
lines = dropwhile(lambda line: not line.startswith('Commands:'), lines)
lines = islice(lines, 1, None) # Old version docker returns its output to stdout
lines = list(takewhile(lambda line: line != '\n', lines)) if lines:
return [line.strip().split(' ')[0] for line in lines] lines = [line.decode('utf-8') for line in lines]
lines = dropwhile(lambda line: not line.startswith('Commands:'), lines)
lines = islice(lines, 1, None)
lines = list(takewhile(lambda line: line != '\n', lines))
return [line.strip().split(' ')[0] for line in lines]
# New version of docker returns its output to stderr
else:
lines = proc.stderr.readlines()
lines = [line.decode('utf-8') for line in lines]
lines = dropwhile(lambda line: not line.startswith('Commands:'), lines)
lines = islice(lines, 1, None)
lines = list(takewhile(lambda line: line != '\n', lines))
return [line.strip().split(' ')[0] for line in lines]
if which('docker'): if which('docker'):