From 6aafe02320d539943967896cc4901c2eafcb2f47 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 6 Dec 2017 19:56:44 +0100 Subject: [PATCH] Make sure scripts are removed correctly --- qutebrowser/browser/webengine/webenginesettings.py | 5 +++-- qutebrowser/browser/webengine/webview.py | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 35eb4b916..adc7a1034 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -262,9 +262,10 @@ def inject_userscripts(): scripts = profile.scripts() for script in scripts.toList(): if script.name().startswith("GM-"): - log.greasemonkey.debug('removing script: {}' + log.greasemonkey.debug('Removing script: {}' .format(script.name())) - scripts.remove(script) + removed = scripts.remove(script) + assert removed, script.name() # Then add the new scripts. for script in greasemonkey.all_scripts(): diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index 0668e3aa5..b313fc36c 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -319,9 +319,10 @@ class WebEnginePage(QWebEnginePage): scripts = self.scripts() for script in scripts.toList(): if script.name().startswith("GM-"): - really_removed = scripts.remove(script) - log.greasemonkey.debug("Removing ({}) script: {}" - .format(really_removed, script.name())) + log.greasemonkey.debug("Removing script: {}" + .format(script.name())) + removed = scripts.remove(script) + assert removed, script.name() def _add_script(script, injection_point): new_script = QWebEngineScript()