GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fix(cli): debug and no_raise can be used together in sys.excepthook · commitizen-tools/commitizen@bc2ba39

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

commitizen
- cli.py
tests
- test_cli.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎commitizen/cli.py‎`

Copy file name to clipboardExpand all lines: commitizen/cli.py

+8-20Lines changed: 8 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -559,8 +559,6 @@ def __call__(`
`559`	`559`	`},`
`560`	`560`	`}`
`561`	`561`
`562`		`-original_excepthook = sys.excepthook`
`563`		`-`
`564`	`562`
`565`	`563`	`def commitizen_excepthook(`
`566`	`564`	`type: type[BaseException],`
`@@ -571,26 +569,19 @@ def commitizen_excepthook(`
`571`	`569`	`) -> None:`
`572`	`570`	`traceback = traceback if isinstance(traceback, TracebackType) else None`
`573`	`571`	`if not isinstance(value, CommitizenException):`
`574`		`- original_excepthook(type, value, traceback)`
	`572`	`+ sys.__excepthook__(type, value, traceback)`
`575`	`573`	`return`
`576`	`574`
`577`		`- if not no_raise:`
`578`		`- no_raise = []`
`579`	`575`	`if value.message:`
`580`	`576`	`value.output_method(value.message)`
`581`	`577`	`if debug:`
`582`		`- original_excepthook(type, value, traceback)`
	`578`	`+ sys.__excepthook__(type, value, traceback)`
`583`	`579`	`exit_code = value.exit_code`
`584`		`- if exit_code in no_raise:`
`585`		`- exit_code = ExitCode.EXPECTED_EXIT`
	`580`	`+ if no_raise is not None and exit_code in no_raise:`
	`581`	`+ sys.exit(ExitCode.EXPECTED_EXIT)`
`586`	`582`	`sys.exit(exit_code)`
`587`	`583`
`588`	`584`
`589`		`-commitizen_debug_excepthook = partial(commitizen_excepthook, debug=True)`
`590`		`-`
`591`		`-sys.excepthook = commitizen_excepthook`
`592`		`-`
`593`		`-`
`594`	`585`	`def parse_no_raise(comma_separated_no_raise: str) -> list[int]:`
`595`	`586`	`"""Convert the given string to exit codes.`
`596`	`587`
`@@ -682,15 +673,12 @@ def main() -> None:`
`682`	`673`	`elif not conf.path:`
`683`	`674`	`conf.update({"name": "cz_conventional_commits"})`
`684`	`675`
	`676`	`+ sys.excepthook = commitizen_excepthook`
`685`	`677`	`if args.debug:`
`686`	`678`	`logging.getLogger("commitizen").setLevel(logging.DEBUG)`
`687`		`- sys.excepthook = commitizen_debug_excepthook`
`688`		`- elif args.no_raise:`
`689`		`- no_raise_exit_codes = parse_no_raise(args.no_raise)`
`690`		`- no_raise_debug_excepthook = partial(`
`691`		`- commitizen_excepthook, no_raise=no_raise_exit_codes`
`692`		`- )`
`693`		`- sys.excepthook = no_raise_debug_excepthook`
	`679`	`+ sys.excepthook = partial(sys.excepthook, debug=True)`
	`680`	`+ if args.no_raise:`
	`681`	`+ sys.excepthook = partial(sys.excepthook, no_raise=parse_no_raise(args.no_raise))`
`694`	`682`
`695`	`683`	`args.func(conf, arguments)() # type: ignore[arg-type]`
`696`	`684`

Collapse file

`‎tests/test_cli.py‎`

Copy file name to clipboardExpand all lines: tests/test_cli.py

+7-7Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,18 +186,18 @@ def test_unknown_args_before_double_dash_raises(mocker: MockFixture):`
`186`	`186`
`187`	`187`
`188`	`188`	`def test_commitizen_excepthook_non_commitizen_exception(mocker: MockFixture):`
`189`		`- """Test that commitizen_excepthook delegates to original_excepthook for non-CommitizenException."""`
	`189`	`+ """Test that commitizen_excepthook delegates to sys.__excepthook__ for non-CommitizenException."""`
`190`	`190`	`# Mock the original excepthook`
`191`	`191`	`mock_original_excepthook = mocker.Mock()`
`192`		`- mocker.patch("commitizen.cli.original_excepthook", mock_original_excepthook)`
	`192`	`+ mocker.patch("commitizen.cli.sys.__excepthook__", mock_original_excepthook)`
`193`	`193`
`194`	`194`	`# Create a regular exception`
`195`	`195`	`test_exception = ValueError("test error")`
`196`	`196`
`197`	`197`	`# Call commitizen_excepthook with the regular exception`
`198`	`198`	`cli.commitizen_excepthook(ValueError, test_exception, None)`
`199`	`199`
`200`		`- # Verify original_excepthook was called with correct arguments`
	`200`	`+ # Verify sys.__excepthook__ was called with correct arguments`
`201`	`201`	`mock_original_excepthook.assert_called_once_with(ValueError, test_exception, None)`
`202`	`202`
`203`	`203`
`@@ -207,7 +207,7 @@ def test_commitizen_excepthook_non_commitizen_exception_with_traceback(`
`207`	`207`	`"""Test that commitizen_excepthook handles traceback correctly for non-CommitizenException."""`
`208`	`208`	`# Mock the original excepthook`
`209`	`209`	`mock_original_excepthook = mocker.Mock()`
`210`		`- mocker.patch("commitizen.cli.original_excepthook", mock_original_excepthook)`
	`210`	`+ mocker.patch("commitizen.cli.sys.__excepthook__", mock_original_excepthook)`
`211`	`211`
`212`	`212`	`# Create a regular exception with a traceback`
`213`	`213`	`test_exception = ValueError("test error")`
`@@ -216,7 +216,7 @@ def test_commitizen_excepthook_non_commitizen_exception_with_traceback(`
`216`	`216`	`# Call commitizen_excepthook with the regular exception and traceback`
`217`	`217`	`cli.commitizen_excepthook(ValueError, test_exception, test_traceback)`
`218`	`218`
`219`		`- # Verify original_excepthook was called with correct arguments including traceback`
	`219`	`+ # Verify sys.__excepthook__ was called with correct arguments including traceback`
`220`	`220`	`mock_original_excepthook.assert_called_once_with(`
`221`	`221`	`ValueError, test_exception, test_traceback`
`222`	`222`	`)`
`@@ -228,7 +228,7 @@ def test_commitizen_excepthook_non_commitizen_exception_with_invalid_traceback(`
`228`	`228`	`"""Test that commitizen_excepthook handles invalid traceback correctly for non-CommitizenException."""`
`229`	`229`	`# Mock the original excepthook`
`230`	`230`	`mock_original_excepthook = mocker.Mock()`
`231`		`- mocker.patch("commitizen.cli.original_excepthook", mock_original_excepthook)`
	`231`	`+ mocker.patch("commitizen.cli.sys.__excepthook__", mock_original_excepthook)`
`232`	`232`
`233`	`233`	`# Create a regular exception with an invalid traceback`
`234`	`234`	`test_exception = ValueError("test error")`
`@@ -237,5 +237,5 @@ def test_commitizen_excepthook_non_commitizen_exception_with_invalid_traceback(`
`237`	`237`	`# Call commitizen_excepthook with the regular exception and invalid traceback`
`238`	`238`	`cli.commitizen_excepthook(ValueError, test_exception, test_traceback)`
`239`	`239`
`240`		`- # Verify original_excepthook was called with None as traceback`
	`240`	`+ # Verify sys.__excepthook__ was called with None as traceback`
`241`	`241`	`mock_original_excepthook.assert_called_once_with(ValueError, test_exception, None)`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.