8000 gh-112730: Use color to highlight error locations by pablogsal · Pull Request #112732 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-112730: Use color to highlight error locations #112732

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 10 commits into from
Dec 6, 2023
Merged

gh-112730: Use color to highlight error locations #112732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9bc06ed
gh-112730: Use color to highlight error locations
pablogsal Dec 4, 2023
7671e2d
Make it work on windows
pablogsal Dec 5, 2023
ff19eec
Reorder env variable checks
pablogsal Dec 5, 2023
9ae4c77
Add more docs
pablogsal Dec 5, 2023
e4a0717
Add more colors
pablogsal Dec 5, 2023
1838f1c
Add test for syntax error (and fix colorization)
pablogsal Dec 5, 2023
a84f929
Fix multiline output
pablogsal Dec 6, 2023
158c09f
Merge branch 'main' into gh-112730
ambv Dec 6, 2023
8a07163
s/PY_COLORS/PYTHON_COLORS/
ambv Dec 6, 2023
f0aea49
Make PYTHON_COLORS higher precedence than NO_COLOR and FORCE_COLOR
ambv Dec 6, 2023
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
Prev Previous commit
Make PYTHON_COLORS higher precedence than NO_COLOR and FORCE_COLOR
  • Loading branch information
@ambv
ambv committed Dec 6, 2023
commit f0aea495834e9ad2bc514574bcea7249ebf63e66
3 changes: 2 additions & 1 deletion Doc/using/cmdline.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,8 @@ in the output. This takes precedence over ``FORCE_COLOR``.
All these environment variables are used also by other tools to control color
output. To control the color output only in the Python interpreter, the
:envvar:`PYTHON_COLORS` environment variable can be used. This variable takes
less precedence than ``NO_COLOR`` and ``FORCE_COLOR``.
precedence over ``NO_COLOR``, which in turn takes precedence over
``FORCE_COLOR``.

Options you shouldn't use
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
4 changes: 3 additions & 1 deletion Lib/test/test_traceback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4354,11 +4354,13 @@ def test_colorized_detection_checks_for_environment_variables(self):
with unittest.mock.patch("os.environ", {'NO_COLOR': '1'}):
self.assertEqual(traceback._can_colorize(), False)
with unittest.mock.patch("os.environ", {'NO_COLOR': '1', "PYTHON_COLORS": '1'}):
self.assertEqual(traceback._can_colorize(), False)
self.assertEqual(traceback._can_colorize(), True)
with unittest.mock.patch("os.environ", {'FORCE_COLOR': '1'}):
self.assertEqual(traceback._can_colorize(), True)
with unittest.mock.patch("os.environ", {'FORCE_COLOR': '1', 'NO_COLOR': '1'}):
self.assertEqual(traceback._can_colorize(), False)
with unittest.mock.patch("os.environ", {'FORCE_COLOR': '1', "PYTHON_COLORS": '0'}):
self.assertEqual(traceback._can_colorize(), False)
isatty_mock.return_value = False
self.assertEqual(traceback._can_colorize(), False)

Expand Down
8000
8 changes: 4 additions & 4 deletions Lib/traceback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,16 @@ def _can_colorize():
except (ImportError, AttributeError):
return False

if "NO_COLOR" in os.environ:
return False
if os.environ.get("PYTHON_COLORS") == "0":
return False
if os.environ.get("PYTHON_COLORS") == "1":
return True
if "NO_COLOR" in os.environ:
return False
if not _COLORIZE:
return False
if "FORCE_COLOR" in os.environ:
return True
if os.environ.get("PYTHON_COLORS") == "1":
return True
if os.environ.get("TERM") == "dumb":
return False
try:
Expand Down
2A49
0