From 0309113b0a6106442abc205d6064cec9a87160b0 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 18 Feb 2020 09:12:16 +1000 Subject: [PATCH] fix legacy filter return values being ignored --- pylib/tools/hookslib.py | 2 +- qt/aqt/gui_hooks.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pylib/tools/hookslib.py b/pylib/tools/hookslib.py index 511dfdfd7..c3539cf44 100644 --- a/pylib/tools/hookslib.py +++ b/pylib/tools/hookslib.py @@ -139,7 +139,7 @@ class {self.classname()}: if self.legacy_hook: out += f"""\ # legacy support - runFilter({self.legacy_args()}) + {arg_names[0]} = runFilter({self.legacy_args()}) """ out += f"""\ diff --git a/qt/aqt/gui_hooks.py b/qt/aqt/gui_hooks.py index 26d6de196..c4c5aa258 100644 --- a/qt/aqt/gui_hooks.py +++ b/qt/aqt/gui_hooks.py @@ -350,7 +350,7 @@ class _CardWillShowFilter: self._hooks.remove(filter) raise # legacy support - runFilter("prepareQA", text, card, kind) + text = runFilter("prepareQA", text, card, kind) return text @@ -668,7 +668,7 @@ class _EditorDidUnfocusFieldFilter: self._hooks.remove(filter) raise # legacy support - runFilter("editFocusLost", changed, note, current_field_idx) + changed = runFilter("editFocusLost", changed, note, current_field_idx) return changed @@ -747,7 +747,7 @@ class _EditorWillUseFontForFieldFilter: self._hooks.remove(filter) raise # legacy support - runFilter("mungeEditingFontName", font) + font = runFilter("mungeEditingFontName", font) return font @@ -1287,7 +1287,7 @@ class _StyleDidInitFilter: self._hooks.remove(filter) raise # legacy support - runFilter("setupStyle", style) + style = runFilter("setupStyle", style) return style