From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:24:10 +0000 (+0200)
Subject: gh-129061: Fix `FORCE_COLOR` and `NO_COLOR` when empty strings (#129140)
X-Git-Tag: v3.14.0a5~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9546fe2ef2db921709f3cb355b33bba977658672;p=thirdparty%2FPython%2Fcpython.git

gh-129061: Fix `FORCE_COLOR` and `NO_COLOR` when empty strings (#129140)
---

diff --git a/Lib/_colorize.py b/Lib/_colorize.py
index 5e36e45734a5..41e818f2a747 100644
--- a/Lib/_colorize.py
+++ b/Lib/_colorize.py
@@ -42,11 +42,11 @@ def can_colorize(*, file=None) -> bool:
             return False
         if os.environ.get("PYTHON_COLORS") == "1":
             return True
-    if "NO_COLOR" in os.environ:
+    if os.environ.get("NO_COLOR"):
         return False
     if not COLORIZE:
         return False
-    if "FORCE_COLOR" in os.environ:
+    if os.environ.get("FORCE_COLOR"):
         return True
     if os.environ.get("TERM") == "dumb":
         return False
diff --git a/Lib/test/test__colorize.py b/Lib/test/test__colorize.py
index ff15d83cb078..056a5306ced1 100644
--- a/Lib/test/test__colorize.py
+++ b/Lib/test/test__colorize.py
@@ -44,8 +44,10 @@ class TestColorizeFunction(unittest.TestCase):
                 check({'TERM': ''}, fallback, fallback)
                 check({'FORCE_COLOR': '1'}, fallback, True)
                 check({'FORCE_COLOR': '0'}, fallback, True)
+                check({'FORCE_COLOR': ''}, fallback, fallback)
                 check({'NO_COLOR': '1'}, fallback, False)
                 check({'NO_COLOR': '0'}, fallback, False)
+                check({'NO_COLOR': ''}, fallback, fallback)
 
             check({'TERM': 'dumb', 'FORCE_COLOR': '1'}, False, True)
             check({'FORCE_COLOR': '1', 'NO_COLOR': '1'}, True, False)
diff --git a/Misc/NEWS.d/next/Library/2025-01-21-18-52-32.gh-issue-129061.4idD_B.rst b/Misc/NEWS.d/next/Library/2025-01-21-18-52-32.gh-issue-129061.4idD_B.rst
new file mode 100644
index 000000000000..5c5c05e1161e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-01-21-18-52-32.gh-issue-129061.4idD_B.rst
@@ -0,0 +1 @@
+Fix FORCE_COLOR and NO_COLOR when empty strings. Patch by Hugo van Kemenade.