From c864ca938437736638c1b4582b3e162fe44ba899 Mon Sep 17 00:00:00 2001 From: Tymoteusz Jankowski Date: Wed, 4 Dec 2019 20:10:46 +0100 Subject: [PATCH] Move is_exec_found(..) to dvc/dagascii.py --- dvc/dagascii.py | 3 +-- dvc/utils/__init__.py | 5 ----- tests/func/test_utils.py | 10 ---------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dvc/dagascii.py b/dvc/dagascii.py index bbf0cca5f..240bdc37b 100644 --- a/dvc/dagascii.py +++ b/dvc/dagascii.py @@ -16,7 +16,6 @@ from grandalf.routing import EdgeViewer from grandalf.routing import route_with_lines from dvc.env import DVC_PAGER -from dvc.utils import is_exec_found logger = logging.getLogger(__name__) @@ -32,7 +31,7 @@ def find_pager(): if not sys.stdout.isatty(): return pydoc.plainpager - if is_exec_found(DEFAULT_PAGER): + if os.system("({}) 2>{}".format(DEFAULT_PAGER, os.devnull)) == 0: pager_cmd = os.getenv(DVC_PAGER, DEFAULT_PAGER_FORMATTED) def less_pager(text): diff --git a/dvc/utils/__init__.py b/dvc/utils/__init__.py index 43de56dea..68ba41877 100644 --- a/dvc/utils/__init__.py +++ b/dvc/utils/__init__.py @@ -420,8 +420,3 @@ def resolve_output(inp, out): if os.path.isdir(out): return os.path.join(out, name) return out - - -def is_exec_found(exec_name): - cmd = "({}) 2>{}".format(exec_name, os.devnull) - return os.system(cmd) == 0 diff --git a/tests/func/test_utils.py b/tests/func/test_utils.py index 33fad8a82..594fdc332 100644 --- a/tests/func/test_utils.py +++ b/tests/func/test_utils.py @@ -88,13 +88,3 @@ def test_makedirs_permissions(tmpdir): assert stat.S_IMODE(os.stat(test_dir).st_mode) == dir_mode assert stat.S_IMODE(os.stat(intermediate_dir).st_mode) == dir_mode - - -def test_is_exec_found_returns_true_when_program_exists(): - result = utils.is_exec_found("echo") - assert result is True - - -def test_is_exec_found_returns_false_when_program_is_missing(): - result = utils.is_exec_found("some-missing-program") - assert result is False