From 947ca444df15ac38777c13399693a99112c09fe1 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 9 Aug 2024 10:58:35 +1200 Subject: [PATCH 1/4] Handle CTRL+C by showing a better message --- codespell_lib/__main__.py | 2 +- codespell_lib/_codespell.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/codespell_lib/__main__.py b/codespell_lib/__main__.py index 0a8630df52..a290b3107d 100644 --- a/codespell_lib/__main__.py +++ b/codespell_lib/__main__.py @@ -6,4 +6,4 @@ try: sys.exit(_script_main()) except KeyboardInterrupt: - pass + sys.exit(f"\ncancelling '{sys.argv[0]}'\n") diff --git a/codespell_lib/_codespell.py b/codespell_lib/_codespell.py index c7cc63bcfe..fba5441fb6 100644 --- a/codespell_lib/_codespell.py +++ b/codespell_lib/_codespell.py @@ -1099,7 +1099,11 @@ def flatten_clean_comma_separated_arguments( def _script_main() -> int: """Wrap to main() for setuptools.""" - return main(*sys.argv[1:]) + try: + return main(*sys.argv[1:]) + except KeyboardInterrupt: + sys.stderr.write(f"\ncancelling '{sys.argv[0]}'\n") + return 1 def _usage_error(parser: argparse.ArgumentParser, message: str) -> int: From c0078117381240d03cae24d5502171298b7bff53 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 9 Aug 2024 12:12:22 +1200 Subject: [PATCH 2/4] Use one try/except block; capitalize; return 130 --- codespell_lib/__main__.py | 5 +---- codespell_lib/_codespell.py | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/codespell_lib/__main__.py b/codespell_lib/__main__.py index a290b3107d..ecc82e092b 100644 --- a/codespell_lib/__main__.py +++ b/codespell_lib/__main__.py @@ -3,7 +3,4 @@ from ._codespell import _script_main if __name__ == "__main__": - try: - sys.exit(_script_main()) - except KeyboardInterrupt: - sys.exit(f"\ncancelling '{sys.argv[0]}'\n") + sys.exit(_script_main()) diff --git a/codespell_lib/_codespell.py b/codespell_lib/_codespell.py index fba5441fb6..7b46bb90c4 100644 --- a/codespell_lib/_codespell.py +++ b/codespell_lib/_codespell.py @@ -1102,8 +1102,9 @@ def _script_main() -> int: try: return main(*sys.argv[1:]) except KeyboardInterrupt: - sys.stderr.write(f"\ncancelling '{sys.argv[0]}'\n") - return 1 + # User has typed CTRL+C + sys.stderr.write(f"\nCancelling '{sys.argv[0]}'\n") + return 130 def _usage_error(parser: argparse.ArgumentParser, message: str) -> int: From aa1b00e8f95c21ff4185200beb3d2ba015329c13 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 9 Aug 2024 13:54:21 +1200 Subject: [PATCH 3/4] First EOL for STDOUT --- codespell_lib/_codespell.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/codespell_lib/_codespell.py b/codespell_lib/_codespell.py index 7b46bb90c4..1d7c5d8b6f 100644 --- a/codespell_lib/_codespell.py +++ b/codespell_lib/_codespell.py @@ -1103,7 +1103,8 @@ def _script_main() -> int: return main(*sys.argv[1:]) except KeyboardInterrupt: # User has typed CTRL+C - sys.stderr.write(f"\nCancelling '{sys.argv[0]}'\n") + sys.stdout.write("\n") + sys.stderr.write(f"Cancelling '{sys.argv[0]}'\n") return 130 From 1b201f309fe420acd80de215d0d4f34feed63b34 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 9 Sep 2024 20:56:14 +1200 Subject: [PATCH 4/4] Remove message --- codespell_lib/_codespell.py | 1 - 1 file changed, 1 deletion(-) diff --git a/codespell_lib/_codespell.py b/codespell_lib/_codespell.py index 1d7c5d8b6f..7198e99e9e 100644 --- a/codespell_lib/_codespell.py +++ b/codespell_lib/_codespell.py @@ -1104,7 +1104,6 @@ def _script_main() -> int: except KeyboardInterrupt: # User has typed CTRL+C sys.stdout.write("\n") - sys.stderr.write(f"Cancelling '{sys.argv[0]}'\n") return 130