From cfbfacb68f3f897c4abb494e34f31855af321661 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:16:07 -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: "9e46b15c9" upstream: origin: "https://github.com/dalthviz/spyder-kernels.git" branch: "spyder_22181" commit: "9e46b15c9" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- external-deps/spyder-kernels/.gitrepo | 4 ++-- .../spyder-kernels/spyder_kernels/console/outstream.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 68d0d786cef..b60914666ca 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 = bd7495212e02c276f818bdf768829cb81716f87b - parent = 1706abfdf5b85934d30f706a6920f515f5cb0506 + commit = 9e46b15c99adb74690561dcd58cf3a275d8ea227 + parent = 9b1286de3c390d672aa90a8f47b76fb6ba63901d 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 2357320bf8a..ea6c9ea2e11 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/outstream.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/outstream.py @@ -43,7 +43,10 @@ def _flush(self): print(f"Flush failed: {e}", file=sys.__stderr__) for parent, data in self._flush_buffers(): + # Messages that will not be printed to the console. This allows us + # 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]): # FIXME: this disables Session's fork-safe check, # since pub_thread is itself fork-safe.