diff options
| author |   Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-01-20 01:18:07 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-01-20 01:18:07 -0800 |
| commit | 648b72900b5039ab46b8b459f921daecb8db2a6b (patch) | |
| tree | 2601c07d8e05b5903d7689e06c138a2fb560c9bb | |
| parent | closes bpo-42938: Replace snprintf with Python unicode formatting in ctypes p... (diff) | |
| download | cpython-648b72900b5039ab46b8b459f921daecb8db2a6b.tar.gz cpython-648b72900b5039ab46b8b459f921daecb8db2a6b.tar.bz2 cpython-648b72900b5039ab46b8b459f921daecb8db2a6b.zip | |
bpo-42005: profile and cProfile catch BrokenPipeError (GH-22643)
(cherry picked from commit 3554fa4abecfb77ac5fcaa5ce8310eeca5683960)
Co-authored-by: Zhiming Wang <i@zhimingwang.org>
| -rwxr-xr-x | Lib/cProfile.py | 7 | ||||
| -rwxr-xr-x | Lib/profile.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-10-11-13-48-03.bpo-42005.Jq6Az-.rst | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/Lib/cProfile.py b/Lib/cProfile.py index 47aacf9e2d4..406a9b7cf11 100755 --- a/Lib/cProfile.py +++ b/Lib/cProfile.py @@ -191,7 +191,12 @@ def main(): '__package__': None, '__cached__': None, } - runctx(code, globs, None, options.outfile, options.sort) + try: + runctx(code, globs, None, options.outfile, options.sort) + except BrokenPipeError as exc: + # Prevent "Exception ignored" during interpreter shutdown. + sys.stdout = None + sys.exit(exc.errno) else: parser.print_usage() return parser diff --git a/Lib/profile.py b/Lib/profile.py index 9df4435c5ae..df4450dac6a 100755 --- a/Lib/profile.py +++ b/Lib/profile.py @@ -611,7 +611,12 @@ def main(): '__package__': None, '__cached__': None, } - runctx(code, globs, None, options.outfile, options.sort) + try: + runctx(code, globs, None, options.outfile, options.sort) + except BrokenPipeError as exc: + # Prevent "Exception ignored" during interpreter shutdown. + sys.stdout = None + sys.exit(exc.errno) else: parser.print_usage() return parser diff --git a/Misc/NEWS.d/next/Library/2020-10-11-13-48-03.bpo-42005.Jq6Az-.rst b/Misc/NEWS.d/next/Library/2020-10-11-13-48-03.bpo-42005.Jq6Az-.rst new file mode 100644 index 00000000000..be4ed7f55ff --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-11-13-48-03.bpo-42005.Jq6Az-.rst @@ -0,0 +1,2 @@ +Fix CLI of :mod:`cProfile` and :mod:`profile` to catch +:exc:`BrokenPipeError`. |