Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.3k
gh-133346: Make theming support in _colorize extensible#133347
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
21 commits Select commitHold shift + click to select a range
3344008 gh-133346: Make theming support in _colorize extensible
ambv68e2385 Fix lint
ambv252dfa0 Add theming to traceback.py
ambvb29c9b9 Fix WASI test failures
ambvca34939 Apply suggestions from code review
ambv5c5c3e1 Add theming to unittest
hugovkf449e7b Add missing plumbing for _colorize.Unittest
ambv8da314f Adapt tests to theming when executed with -j
ambv65d3a78 Fix. lint.
ambv0866fd8 Add blurb and some docstrings
ambv965c7cf FIX. LINT.
ambv230d658 Add theming to argparse
hugovkc4808c8 Apply suggestions from code review
ambvfd9c85c Update test_argparse to use theme not color and fix bug
hugovk664ef14 Merge branch 'main' into colorize-theme-support
ambve67fda9 Rename REPL to Syntax now that pdb is using it, too; adapt pdb tests
ambv70ca161 Bring json.tool into the theming fold
ambv3166d63 Merge branch 'main' into colorize-theme-support
ambv5c45ddb Make no_colors() into classmethods
ambv68a5c44 Address review
ambv9f51769 Group effort
ambvFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Add theming to traceback.py
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit252dfa059f2a8784b4a802198ae8a4d83bf5b31a
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -122,18 +122,38 @@ class REPL(ThemeSection): | ||
| reset: str = ANSIColors.RESET | ||
| @dataclass(frozen=True) | ||
| class Traceback(ThemeSection): | ||
| type: str = ANSIColors.BOLD_MAGENTA | ||
| message: str = ANSIColors.MAGENTA | ||
| filename: str = ANSIColors.MAGENTA | ||
| line_no: str = ANSIColors.MAGENTA | ||
| frame: str = ANSIColors.MAGENTA | ||
| error_highlight: str = ANSIColors.BOLD_RED | ||
| error_range: str = ANSIColors.RED | ||
| reset: str = ANSIColors.RESET | ||
| @dataclass(frozen=True) | ||
| class Theme: | ||
| repl: REPL = field(default_factory=REPL) | ||
| traceback: Traceback = field(default_factory=Traceback) | ||
| def copy_with( | ||
| self, | ||
| *, | ||
| repl: REPL | None = None, | ||
| traceback: Traceback | None = None, | ||
| ) -> Self: | ||
| return type(self)( | ||
| repl=repl or self.repl, | ||
| traceback=traceback or self.traceback, | ||
| ) | ||
| def no_colors(self) -> Self: | ||
ambv marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| return type(self)( | ||
| repl=self.repl.no_colors(), | ||
| traceback=self.traceback.no_colors(), | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
114 changes: 58 additions & 56 deletionsLib/test/test_traceback.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -37,6 +37,12 @@ | ||
| test_frame = namedtuple('frame', ['f_code', 'f_globals', 'f_locals']) | ||
| test_tb = namedtuple('tb', ['tb_frame', 'tb_lineno', 'tb_next', 'tb_lasti']) | ||
| color_overrides = {"reset": "z", "filename": "fn", "error_highlight": "E"} | ||
| colors = { | ||
| color_overrides.get(k, k[0].lower()): v | ||
| for k, v in _colorize.default_theme.traceback.items() | ||
| } | ||
| LEVENSHTEIN_DATA_FILE = Path(__file__).parent / 'levenshtein_examples.json' | ||
| @@ -4721,6 +4727,8 @@ class MyList(list): | ||
| class TestColorizedTraceback(unittest.TestCase): | ||
| maxDiff = None | ||
| def test_colorized_traceback(self): | ||
| def foo(*args): | ||
| x = {'a':{'b': None}} | ||
| @@ -4743,9 +4751,9 @@ def bar(): | ||
| e, capture_locals=True | ||
| ) | ||
| lines = "".join(exc.format(colorize=True)) | ||
| red =colors["e"] | ||
| boldr =colors["E"] | ||
| reset =colors["z"] | ||
ambv marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| self.assertIn("y = " + red + "x['a']['b']" + reset + boldr + "['c']" + reset, lines) | ||
| self.assertIn("return " + red + "(lambda *args: foo(*args))" + reset + boldr + "(1,2,3,4)" + reset, lines) | ||
| self.assertIn("return (lambda *args: " + red + "foo" + reset + boldr + "(*args)" + reset + ")(1,2,3,4)", lines) | ||
| @@ -4761,18 +4769,16 @@ def test_colorized_syntax_error(self): | ||
| e, capture_locals=True | ||
| ) | ||
| actual = "".join(exc.format(colorize=True)) | ||
| def expected(t, m, fn, l, f, E, e, z): | ||
| return "".join( | ||
| [ | ||
| f' File {fn}"<string>"{z}, line {l}1{z}\n', | ||
| f' a {E}${z} b\n', | ||
| f' {E}^{z}\n', | ||
| f'{t}SyntaxError{z}: {m}invalid syntax{z}\n' | ||
| ] | ||
| ) | ||
| self.assertIn(expected(**colors), actual) | ||
| def test_colorized_traceback_is_the_default(self): | ||
| def foo(): | ||
| @@ -4788,23 +4794,21 @@ def foo(): | ||
| exception_print(e) | ||
| actual = tbstderr.getvalue().splitlines() | ||
| lno_foo = foo.__code__.co_firstlineno | ||
| def expected(t, m, fn, l, f, E, e, z): | ||
| return [ | ||
| 'Traceback (most recent call last):', | ||
| f' File {fn}"{__file__}"{z}, ' | ||
| f'line {l}{lno_foo+5}{z}, in {f}test_colorized_traceback_is_the_default{z}', | ||
| f' {e}foo{z}{E}(){z}', | ||
| f' {e}~~~{z}{E}^^{z}', | ||
| f' File {fn}"{__file__}"{z}, ' | ||
| f'line {l}{lno_foo+1}{z}, in {f}foo{z}', | ||
| f' {e}1{z}{E}/{z}{e}0{z}', | ||
| f' {e}~{z}{E}^{z}{e}~{z}', | ||
| f'{t}ZeroDivisionError{z}: {m}division by zero{z}', | ||
| ] | ||
| self.assertEqual(actual, expected(**colors)) | ||
| def test_colorized_traceback_from_exception_group(self): | ||
| def foo(): | ||
| @@ -4822,33 +4826,31 @@ def foo(): | ||
| e, capture_locals=True | ||
| ) | ||
| lno_foo = foo.__code__.co_firstlineno | ||
| actual = "".join(exc.format(colorize=True)).splitlines() | ||
| def expected(t, m, fn, l, f, E, e, z): | ||
ambv marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| return [ | ||
| f" + Exception Group Traceback (most recent call last):", | ||
| f' | File {fn}"{__file__}"{z}, line {l}{lno_foo+9}{z}, in {f}test_colorized_traceback_from_exception_group{z}', | ||
| f' | {e}foo{z}{E}(){z}', | ||
| f' | {e}~~~{z}{E}^^{z}', | ||
| f" | e = ExceptionGroup('test', [ZeroDivisionError('division by zero')])", | ||
| f" | foo = {foo}", | ||
| f' | self = <{__name__}.TestColorizedTraceback testMethod=test_colorized_traceback_from_exception_group>', | ||
| f' | File {fn}"{__file__}"{z}, line {l}{lno_foo+6}{z}, in {f}foo{z}', | ||
| f' | raise ExceptionGroup("test", exceptions)', | ||
| f" | exceptions = [ZeroDivisionError('division by zero')]", | ||
| f' | {t}ExceptionGroup{z}: {m}test (1 sub-exception){z}', | ||
| f' +-+---------------- 1 ----------------', | ||
| f' | Traceback (most recent call last):', | ||
| f' | File {fn}"{__file__}"{z}, line {l}{lno_foo+3}{z}, in {f}foo{z}', | ||
| f' | {e}1 {z}{E}/{z}{e} 0{z}', | ||
| f' | {e}~~{z}{E}^{z}{e}~~{z}', | ||
| f" | exceptions = [ZeroDivisionError('division by zero')]", | ||
| f' | {t}ZeroDivisionError{z}: {m}division by zero{z}', | ||
| f' +------------------------------------', | ||
| ] | ||
| self.assertEqual(actual, expected(**colors)) | ||
| if __name__ == "__main__": | ||
| unittest.main() | ||
102 changes: 46 additions & 56 deletionsLib/traceback.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.