Skip to content

Commit 9546fe2

Browse files
authored
gh-129061: Fix FORCE_COLOR and NO_COLOR when empty strings (#129140)
1 parent d6f010d commit 9546fe2

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Lib/_colorize.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ def can_colorize(*, file=None) -> bool:
4242
return False
4343
if os.environ.get("PYTHON_COLORS") == "1":
4444
return True
45-
if "NO_COLOR" in os.environ:
45+
if os.environ.get("NO_COLOR"):
4646
return False
4747
if not COLORIZE:
4848
return False
49-
if "FORCE_COLOR" in os.environ:
49+
if os.environ.get("FORCE_COLOR"):
5050
return True
5151
if os.environ.get("TERM") == "dumb":
5252
return False

Lib/test/test__colorize.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ def check(env, fallback, expected):
4444
check({'TERM': ''}, fallback, fallback)
4545
check({'FORCE_COLOR': '1'}, fallback, True)
4646
check({'FORCE_COLOR': '0'}, fallback, True)
47+
check({'FORCE_COLOR': ''}, fallback, fallback)
4748
check({'NO_COLOR': '1'}, fallback, False)
4849
check({'NO_COLOR': '0'}, fallback, False)
50+
check({'NO_COLOR': ''}, fallback, fallback)
4951

5052
check({'TERM': 'dumb', 'FORCE_COLOR': '1'}, False, True)
5153
check({'FORCE_COLOR': '1', 'NO_COLOR': '1'}, True, False)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix FORCE_COLOR and NO_COLOR when empty strings. Patch by Hugo van Kemenade.

0 commit comments

Comments
 (0)