From f1a13ec89d6a4551294bee9d69fbfc920004ff02 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 27 Dec 2022 09:38:21 -0500 Subject: [PATCH 1/2] Fix forcing color through termcolor Signed-off-by: Matthew Peveler --- tests/test_tldr.py | 3 ++- tldr.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_tldr.py b/tests/test_tldr.py index 0ed0dd1..b49c3ed 100644 --- a/tests/test_tldr.py +++ b/tests/test_tldr.py @@ -12,7 +12,8 @@ @pytest.mark.parametrize("page_name", page_names) -def test_whole_page(page_name): +def test_whole_page(page_name, monkeypatch): + monkeypatch.setenv("FORCE_COLOR", "1") with open(f"tests/data/{page_name}.md", "rb") as f_original: with open(f"tests/data/{page_name}_rendered", "rb") as f_rendered: old_stdout = sys.stdout diff --git a/tldr.py b/tldr.py index 7e96807..41ae404 100755 --- a/tldr.py +++ b/tldr.py @@ -493,6 +493,8 @@ def main() -> None: options = parser.parse_args() colorama.init(strip=options.color) + if options.color == False: + os.environ["FORCE_COLOR"] = "true" if options.update_cache: update_cache(language=options.language) From dad0e59ab1330fc567aadaeee3465016fe6303a5 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 27 Dec 2022 09:45:47 -0500 Subject: [PATCH 2/2] flake8 Signed-off-by: Matthew Peveler --- tldr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tldr.py b/tldr.py index 41ae404..1ac6c39 100755 --- a/tldr.py +++ b/tldr.py @@ -493,7 +493,7 @@ def main() -> None: options = parser.parse_args() colorama.init(strip=options.color) - if options.color == False: + if options.color is False: os.environ["FORCE_COLOR"] = "true" if options.update_cache: