diff --git a/setup.py b/setup.py index 1c8aaac2..e991566d 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup(name='thefuck', - version=1.19, + version=1.20, description="Magnificent app which corrects your previous console command", author='Vladimir Iakovlev', author_email='nvbn.rm@gmail.com', diff --git a/thefuck/rules/no_command.py b/thefuck/rules/no_command.py index c3ecd4b3..bf5b86da 100644 --- a/thefuck/rules/no_command.py +++ b/thefuck/rules/no_command.py @@ -3,18 +3,18 @@ import os from pathlib import Path -def _safe(path, method): +def _safe(fn, fallback): try: - return getattr(path, method)() + return fn() except OSError: - return [] + return fallback def _get_all_bins(): return [exe.name for path in os.environ['PATH'].split(':') - for exe in _safe(Path(path), 'iterdir') - if not _safe(exe, 'is_dir')] + for exe in _safe(Path(path).iterdir, []) + if not _safe(exe.is_dir, True)] def match(command, settings):