From 7a3c30087021351b61fe81e07fe2aa0a4808cb9e Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:00:24 -0500 Subject: [PATCH] git subrepo pull --remote=https://github.com/dalthviz/spyder-kernels.git --branch=spyder_22181 --update --force external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "4ad9b7e02" upstream: origin: "https://github.com/dalthviz/spyder-kernels.git" branch: "spyder_22181" commit: "4ad9b7e02" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- external-deps/spyder-kernels/.gitrepo | 4 ++-- .../spyder-kernels/spyder_kernels/console/outstream.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index b60914666ca..b5b0e8e722e 100644 --- a/external-deps/spyder-kernels/.gitrepo +++ b/external-deps/spyder-kernels/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/dalthviz/spyder-kernels.git branch = spyder_22181 - commit = 9e46b15c99adb74690561dcd58cf3a275d8ea227 - parent = 9b1286de3c390d672aa90a8f47b76fb6ba63901d + commit = 4ad9b7e02e29532480f14d96f48ad547249b1d58 + parent = cfbfacb68f3f897c4abb494e34f31855af321661 method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/spyder_kernels/console/outstream.py b/external-deps/spyder-kernels/spyder_kernels/console/outstream.py index ea6c9ea2e11..78ce38b40f1 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/outstream.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/outstream.py @@ -47,7 +47,9 @@ def _flush(self): # to deal with issues such as spyder-ide/spyder#22181 filter_messages = ["Parent poll failed."] - if data and not any([message in data for message in filter_messages]): + if data and not any( + [message in data for message in filter_messages] + ): # FIXME: this disables Session's fork-safe check, # since pub_thread is itself fork-safe. # There should be a better way to do this.