Skip to content
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

Jump to bottom

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

Merged
merged 11 commits into from
Sep 22, 2020
Merged

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

merged 11 commits into from
Sep 22, 2020

Conversation

graingert
Copy link
Contributor

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

@bedevere-bot bedevere-bot added tests Tests in the Lib/test dir awaiting review labels Aug 25, 2020
graingert
graingert commented Aug 25, 2020
View reviewed changes
Lib/test/test_runpy.py Outdated Show resolved Hide resolved
@graingert graingert changed the title bpo-41602: add tests for sigint handling in runpy bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_run_module Sep 16, 2020
@gvanrossum
Copy link
Member

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?)

@gvanrossum
Copy link
Member

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

graingert and others added 2 commits September 22, 2020 10:10
graingert
graingert commented Sep 22, 2020
View reviewed changes
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.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@gvanrossum gvanrossum merged commit a68a2ad into python:master Sep 22, 2020
@bedevere-bot
Copy link

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

@graingert graingert deleted the pymain-run-module-sigint branch September 22, 2020 16:12
@graingert
Copy link
Contributor Author

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

@ambv ambv added needs backport to 3.8 only security fixes needs backport to 3.9 only security fixes labels Sep 24, 2020
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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
Copy link
Contributor

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
Copy link
Contributor

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

ambv pushed a commit to ambv/cpython that referenced this pull request Sep 24, 2020
@graingert @ambv
[3.9] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pym…
66ec0d3 
…ain_run_module (pythonGH-21956)

Closes bpo issue 41602.
(cherry picked from commit a68a2ad)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 24, 2020
@bedevere-bot
Copy link

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

shihai1991 added a commit to shihai1991/cpython that referenced this pull request Sep 24, 2020
@shihai1991
Merge remote-tracking branch 'origin/master' into bpo_39337_new_3
e29ec44 
* 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
Copy link
Member

@ambv do you agree that this should be backported?

@ambv
Copy link
Contributor

ambv commented Sep 24, 2020

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

ambv added a commit that referenced this pull request Sep 24, 2020
@ambv @graingert
[3.9] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pym…
ca8d46d 
…ain_run_module (GH-21956) (#22397)

Closes bpo issue 41602.
(cherry picked from commit a68a2ad)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
@graingert graingert mentioned this pull request Sep 24, 2020
Merged
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Sep 24, 2020
graingert added a commit to graingert/cpython that referenced this pull request Sep 24, 2020
@graingert
[3.8] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pym…
cccc27a 
…ain_run_module (pythonGH-21956)

Closes bpo issue 41602.
(cherry picked from commit a68a2ad)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
ambv pushed a commit that referenced this pull request Sep 24, 2020
@graingert
[3.8] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pym…
ae46229 
…ain_run_module (GH-21956) (#22398)

Closes bpo issue 41602.
(cherry picked from commit a68a2ad)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
ambv added a commit to ambv/cpython that referenced this pull request Oct 4, 2020
@ambv @graingert
[3.9] bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pym…
c26a666 
…ain_run_module (pythonGH-21956) (python#22397)

Closes bpo issue 41602.
(cherry picked from commit a68a2ad)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
@graingert
bpo-41602: raise SIGINT exit code on KeyboardInterrupt from pymain_ru…
c1b3c0f 
…n_module (python#21956)

Closes bpo issue 41602
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner left review comments

@gvanrossum gvanrossum gvanrossum approved these changes

Assignees

@gvanrossum gvanrossum

Labels
tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@graingert @gvanrossum @bedevere-bot @miss-islington @ambv @vstinner @the-knights-who-say-ni