bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module#21956

graingert · 2020-08-25T19:24:32Z

https://bugs.python.org/issue41602

Lib/test/test_runpy.py

…run-module-sigint

Co-Authored-By: Guido van Rossum <guido@python.org>

This reverts commit a42916b.

gvanrossum · 2020-09-16T21:30:09Z

Requesting review from @vstinner -- since the actual fix was mine and I arrived at that through trial and error. Also, @vstinner do you think this can safely be backported to 3.8 and 3.9? IOW is it merely a bug or is the change in exit code (from 1 to SIGINT) significant enough to consider it a feature? (@graingert There's no documentation, is that right?)

Modules/main.c

Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst

gvanrossum · 2020-09-20T03:59:57Z

@graingert I am waiting for your response (e.g. a new commit) in response to Victor's review. Am I mistaken?

…_as_main

…run-module-sigint

Co-authored-by: Victor Stinner <vstinner@python.org>

graingert · 2020-09-22T15:15:00Z

Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst

@@ -0,0 +1 @@
+Add tests for SIGINT handling in the runpy module.


Suggested change
Add tests for SIGINT handling in the runpy module.
Raise SIGINT exit code on KeyboardInterrupt from pymain_run_module

bedevere-bot · 2020-09-22T15:53:07Z

@gvanrossum: Please replace # with GH- in the commit message next time. Thanks!

graingert · 2020-09-24T11:33:44Z

@ambv I think this needs backporting to v3.8 and v3.9

miss-islington · 2020-09-24T11:36:58Z

Thanks @graingert for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

miss-islington · 2020-09-24T11:36:58Z

Thanks @graingert for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington · 2020-09-24T11:37:16Z

Sorry, @graingert and @gvanrossum, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a68a2ad19c891faa891904b3da537911cc77df21 3.9

miss-islington · 2020-09-24T11:37:18Z

Sorry @graingert and @gvanrossum, I had trouble checking out the 3.8 backport branch.
Please backport using cherry_picker on command line.
cherry_picker a68a2ad19c891faa891904b3da537911cc77df21 3.8

…ain_run_module (pythonGH-21956) Closes bpo issue 41602. (cherry picked from commit a68a2ad) Co-authored-by: Thomas Grainger <tagrain@gmail.com>

bedevere-bot · 2020-09-24T11:43:35Z

GH-22397 is a backport of this pull request to the 3.9 branch.

* origin/master: (27 commits) bpo-41428: Fix compiler warnings in unionobject.c (pythonGH-22388) bpo-41654: Fix compiler warning in MemoryError_dealloc() (pythonGH-22387) bpo-41833: threading.Thread now uses the target name (pythonGH-22357) bpo-30155: Add macros to get tzinfo from datetime instances (pythonGH-21633) bpo-33822: Update IDLE section of What's New 3.8 (pythonGH-22383) bpo-41844: Add IDLE section to What's New 3.9 (GN-22382) bpo-41841: Prepare IDLE News for 3.10 (pythonGH-22379) bpo-37779 : Add information about the overriding behavior of ConfigParser.read (pythonGH-15177) bpo-40170: Use inline _PyType_HasFeature() function (pythonGH-22375) bpo-40941: Fix stackdepth compiler warnings (pythonGH-22377) bpo-40941: Fix fold_tuple_on_constants() compiler warnings (pythonGH-22378) bpo-40521: Fix PyUnicode_InternInPlace() (pythonGH-22376) bpo-41834: Remove _Py_CheckRecursionLimit variable (pythonGH-22359) bpo-1635741, unicodedata: add ucd_type parameter to UCD_Check() macro (pythonGH-22328) bpo-1635741: Port _lsprof extension to multi-phase init (PEP 489) (pythonGH-22220) bpo-41513: Improve order of adding fractional values. Improve variable names. (pythonGH-22368) bpo-41816: `StrEnum.__str__` is `str.__str__` (pythonGH-22362) bpo-35764: Rewrite the IDLE Calltips doc section (pythonGH-22363) bpo-41810: Reintroduce `types.EllipsisType`, `.NoneType` & `.NotImplementedType` (pythonGH-22336) bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module (python#21956) ...

gvanrossum · 2020-09-24T14:32:56Z

@ambv do you agree that this should be backported?

ambv · 2020-09-24T14:34:12Z

Yes, I made the backport to 3.9. 3.8 I'm less convinced due to the import-based conflicts in the tests.

…ain_run_module (GH-21956) (#22397) Closes bpo issue 41602. (cherry picked from commit a68a2ad) Co-authored-by: Thomas Grainger <tagrain@gmail.com>

bedevere-bot · 2020-09-24T15:11:18Z

GH-22398 is a backport of this pull request to the 3.8 branch.

…ain_run_module (pythonGH-21956) Closes bpo issue 41602. (cherry picked from commit a68a2ad) Co-authored-by: Thomas Grainger <tagrain@gmail.com>

…ain_run_module (GH-21956) (#22398) Closes bpo issue 41602. (cherry picked from commit a68a2ad) Co-authored-by: Thomas Grainger <tagrain@gmail.com>

…ain_run_module (pythonGH-21956) (python#22397) Closes bpo issue 41602. (cherry picked from commit a68a2ad) Co-authored-by: Thomas Grainger <tagrain@gmail.com>

…n_module (python#21956) Closes bpo issue 41602

the-knights-who-say-ni added the CLA signed label Aug 25, 2020

bedevere-bot added tests Tests in the Lib/test dir awaiting review labels Aug 25, 2020

bpo-41602: add tests for sigint handling in runpy
ec2856c

graingert force-pushed the pymain-run-module-sigint branch from e3c009e to ec2856cCompare August 25, 2020 19:40

📜🤖 Added by blurb_it.
78ba11c

graingert commented Aug 25, 2020
View reviewed changes

Lib/test/test_runpy.py Outdated Show resolvedHide resolved

check for STATUS_CONTROL_C_EXIT on windows
ce4601a

graingert force-pushed the pymain-run-module-sigint branch from d2d0588 to ce4601aCompare August 25, 2020 21:19

graingert added 2 commits August 25, 2020 22:42

REVERTME: flip the assertion to make the tests pass
a42916b

bpo-41635: noop to work around flaky test
c483f65

graingert commented Aug 25, 2020
View reviewed changes

Lib/test/test_runpy.py Outdated Show resolvedHide resolved

graingertand others added 3 commits September 16, 2020 21:49

Merge branch 'master' of git://github.com/python/cpython into pymain-…
e37a82a
…run-module-sigint

raise SIGINT exit code on KeyboardInterrupt from pymain_run_module
de65294
Co-Authored-By: Guido van Rossum <guido@python.org>

Revert "REVERTME: flip the assertion to make the tests pass"
0b325b6
This reverts commit a42916b.

graingert changed the title ~~bpo-41602: add tests for sigint handling in runpy~~bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_moduleSep 16, 2020

gvanrossum requested a review from vstinner September 16, 2020 21:27

vstinner reviewed Sep 17, 2020
View reviewed changes

Modules/main.cShow resolvedHide resolved
Misc/NEWS.d/next/Tests/2020-08-25-19-25-36.bpo-41602.Z64s0I.rst Outdated Show resolvedHide resolved

reset _Py_UnhandledKeyboardInterrupt before calling runpy._run_module…
4486dcd
…_as_main

graingert force-pushed the pymain-run-module-sigint branch from d2045de to 4486dcdCompare September 22, 2020 09:09

graingertand others added 2 commits September 22, 2020 10:10

Merge branch 'master' of git://github.com/python/cpython into pymain-…
714ad5a
…run-module-sigint

Capitalization and punctuation in blurb.
19f40f7
Co-authored-by: Victor Stinner <vstinner@python.org>

gvanrossum approved these changes Sep 22, 2020
View reviewed changes

bedevere-bot added awaiting merge and removed awaiting review labels Sep 22, 2020

graingert commented Sep 22, 2020
View reviewed changes

graingert requested a review from gvanrossum September 22, 2020 15:15

gvanrossum approved these changes Sep 22, 2020
View reviewed changes

gvanrossum merged commit a68a2ad into python:masterSep 22, 2020

bedevere-bot removed the awaiting merge label Sep 22, 2020

graingert deleted the pymain-run-module-sigint branch September 22, 2020 16:12

ambv added needs backport to 3.8 labels Sep 24, 2020

miss-islington assigned gvanrossum Sep 24, 2020

bedevere-bot removed the needs backport to 3.9 label Sep 24, 2020

graingert mentioned this pull request Sep 24, 2020
[3.8] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module (GH-21956) #22398
Merged

bedevere-bot removed the needs backport to 3.8 label Sep 24, 2020

xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_ru…
c1b3c0f
…n_module (python#21956) Closes bpo issue 41602

		@@ -0,0 +1 @@
		Add tests for SIGINT handling in the runpy module.

	Add tests for SIGINT handling in the runpy module.
	Raise SIGINT exit code on KeyboardInterrupt from pymain_run_module

Uh oh!

bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module#21956

bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module #21956

Uh oh!

Conversation

graingert commented Aug 25, 2020• edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gvanrossum commented Sep 16, 2020

Uh oh!

Uh oh!

Uh oh!

gvanrossum commented Sep 20, 2020

Uh oh!

graingertSep 22, 2020

Choose a reason for hiding this comment

Uh oh!

bedevere-bot commented Sep 22, 2020

Uh oh!

graingert commented Sep 24, 2020

Uh oh!

miss-islington commented Sep 24, 2020

Uh oh!

miss-islington commented Sep 24, 2020

Uh oh!

miss-islington commented Sep 24, 2020

Uh oh!

miss-islington commented Sep 24, 2020

Uh oh!

bedevere-bot commented Sep 24, 2020

Uh oh!

gvanrossum commented Sep 24, 2020

Uh oh!

ambv commented Sep 24, 2020

Uh oh!

bedevere-bot commented Sep 24, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

graingert commented Aug 25, 2020•
edited by bedevere-bot
Loading