Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 27, 2025
Merged

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

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96c2e76
Refactor into subtests
hugovk Jan 21, 2025
c7b5419
Fix FORCE_COLOR and NO_COLOR when empty strings
hugovk Jan 21, 2025
ec36e22
Merge branch 'main' into 3.14-empty-force-color-no-color
hugovk Jan 22, 2025
a738098
Add test cases
hugovk Jan 23, 2025
621e4ab
Reset tests to main
hugovk Jan 25, 2025
5027272
Add test cases for empty values
hugovk Jan 25, 2025
5d40ced
Merge remote-tracking branch 'upstream/main' into 3.14-empty-force-co…
hugovk Jan 25, 2025
e86c7f7
Just add the first two
hugovk Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/_colorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test__colorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,16 @@ def check(env, fallback, expected):
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)
check({'FORCE_COLOR': '1', 'NO_COLOR': ''}, True, True)
check({'FORCE_COLOR': '', 'NO_COLOR': '1'}, True, False)
check({'FORCE_COLOR': '', 'NO_COLOR': ''}, True, True)

for ignore_environment in False, True:
# Simulate running with or without `-E`.
Expand All @@ -64,7 +69,9 @@ def check(env, fallback, expected):

check({'TERM': 'dumb', 'PYTHON_COLORS': '1'}, False, not ignore_environment)
check({'NO_COLOR': '1', 'PYTHON_COLORS': '1'}, False, not ignore_environment)
check({'NO_COLOR': '', 'PYTHON_COLORS': '1'}, False, not ignore_environment)
check({'FORCE_COLOR': '1', 'PYTHON_COLORS': '0'}, True, ignore_environment)
check({'FORCE_COLOR': '', 'PYTHON_COLORS': '0'}, True, ignore_environment)

@unittest.skipUnless(sys.platform == "win32", "requires Windows")
def test_colorized_detection_checks_on_windows(self):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-01-21-18-52-32.gh-issue-129061.4idD_B.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix FORCE_COLOR and NO_COLOR when empty strings. Patch by Hugo van Kemenade.
Loading