From ab3ccf0243e6d957762fd2ebb0d615e3891a993a Mon Sep 17 00:00:00 2001 From: Tymoteusz Jankowski Date: Mon, 2 Dec 2019 20:27:20 +0100 Subject: [PATCH] Use os.devnull + do not check if system exists for os module --- dvc/utils/__init__.py | 4 ++-- tests/func/test_utils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dvc/utils/__init__.py b/dvc/utils/__init__.py index 4a186bfea..43de56dea 100644 --- a/dvc/utils/__init__.py +++ b/dvc/utils/__init__.py @@ -423,5 +423,5 @@ def resolve_output(inp, out): def is_exec_found(exec_name): - cmd = "({}) 2>/dev/null".format(exec_name) - return hasattr(os, "system") and os.system(cmd) == 0 + 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 3b75573a4..33fad8a82 100644 --- a/tests/func/test_utils.py +++ b/tests/func/test_utils.py @@ -91,7 +91,7 @@ def test_makedirs_permissions(tmpdir): def test_is_exec_found_returns_true_when_program_exists(): - result = utils.is_exec_found("python") + result = utils.is_exec_found("echo") assert result is True