From 25ee032229cb9ae29bfb63a5e0452843bb881c8d Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Tue, 7 Mar 2023 14:02:42 -0500 Subject: [PATCH] git subrepo pull (merge) external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "2238972a4" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "2238972a4" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/spyder-kernels/.gitrepo | 4 ++-- .../spyder-kernels/spyder_kernels/console/shell.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 7af9a0dfd1a..56a63016adb 100644 --- a/external-deps/spyder-kernels/.gitrepo +++ b/external-deps/spyder-kernels/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/spyder-ide/spyder-kernels.git branch = master - commit = 163dc4ee6533b2e995fb722893af0d396eaa9153 - parent = d02906ba20d3f0ff7e788fd457cebc8931202792 + commit = 2238972a42a1b0564363de9e5251b04dd8f1f945 + parent = 7df1cee1182a992c84c83350a5a87c36deacc19a method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/spyder_kernels/console/shell.py b/external-deps/spyder-kernels/spyder_kernels/console/shell.py index 98947b82eb9..90bd3c45a81 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/shell.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/shell.py @@ -233,7 +233,13 @@ def raise_interrupt_signal(self): self.kernel.log.error( "Interrupt message not supported on Windows") else: - self.kernel._send_interupt_children() + # This is necessary to make the call below work for IPykernel + # versions equal or less than 6.21.2 and greater than it. + # See ipython/ipykernel#1101 + if hasattr(self.kernel, '_send_interupt_children'): + self.kernel._send_interupt_children() + else: + self.kernel._send_interrupt_children() def request_pdb_stop(self): """Request pdb to stop at the next possible position."""