From 7e7bb797b405d1bc15eea0c11a37ddbceadc3df0 Mon Sep 17 00:00:00 2001 From: Quentin Peter Date: Sun, 10 Sep 2023 06:07:37 +0200 Subject: [PATCH 1/3] fix editor --- .../editor/widgets/editorstack/tests/test_editorstack.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spyder/plugins/editor/widgets/editorstack/tests/test_editorstack.py b/spyder/plugins/editor/widgets/editorstack/tests/test_editorstack.py index 9b48e07558a..d142b006936 100644 --- a/spyder/plugins/editor/widgets/editorstack/tests/test_editorstack.py +++ b/spyder/plugins/editor/widgets/editorstack/tests/test_editorstack.py @@ -72,8 +72,10 @@ def visible_editor_bot(editor_bot, mocker): # We need to patch osp.isfile to avoid the 'this file does not exist' # message box. - mocker.patch('spyder.plugins.editor.widgets.editor.osp.isfile', - returned_value=True) + mocker.patch( + 'spyder.plugins.editor.widgets.editorstack.editorstack.osp.isfile', + returned_value=True + ) editorstack.show() From 8853cf5e6b6995c6bfb61df92b44616692ab2d62 Mon Sep 17 00:00:00 2001 From: Quentin Peter Date: Sun, 10 Sep 2023 06:09:29 +0200 Subject: [PATCH 2/3] Fix docstring --- spyder/plugins/editor/widgets/editorstack/editorstack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spyder/plugins/editor/widgets/editorstack/editorstack.py b/spyder/plugins/editor/widgets/editorstack/editorstack.py index fca8e35eaf7..3083a6c86b9 100644 --- a/spyder/plugins/editor/widgets/editorstack/editorstack.py +++ b/spyder/plugins/editor/widgets/editorstack/editorstack.py @@ -159,7 +159,7 @@ class EditorStack(QWidget, SpyderConfigurationAccessor): See Also -------- - :py:meth:spyder.plugins.editor.widgets.editor.EditorStack.send_to_help + :py:meth:spyder.plugins.editor.widgets.editorstack.EditorStack.send_to_help """ def __init__(self, parent, actions, use_switcher=True): From e6b303bbf65af74b5a5f3c2ff00863e039cd11d2 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 11 Sep 2023 10:52:40 -0500 Subject: [PATCH 3/3] git subrepo pull (merge) --remote=https://github.com/spyder-ide/spyder-kernels.git --branch=master --update --force external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "d7fe712f64" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "d7fe712f64" 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/customize/spyderpdb.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 4a370d45c54..186bb49b9d7 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 = efbade5ff00d7fb609d6cffa572bdef4fd096069 - parent = 7a46e247eaf2d179ffd4b6657b67e8623cb3e4b0 + commit = d7fe712f64ceff9f24550ea95be3963c197cdcbf + parent = c235572d61601c668baf8854e44d4c3c173de6c5 method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py b/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py index b9d76f63adf..0d26986d8a7 100755 --- a/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py +++ b/external-deps/spyder-kernels/spyder_kernels/customize/spyderpdb.py @@ -861,7 +861,7 @@ def get_pdb_state(self): hidden = self.hidden_frames(self.stack) pdb_stack = [f for f, h in zip(pdb_stack, hidden) if not h] # Adjust the index - pdb_index -= sum(hidden[:pdb_index]) + pdb_index -= sum([bool(i) for i in hidden[:pdb_index]]) state['stack'] = (pdb_stack, pdb_index)