From 32268ae66a116aa2e1bab4a9826365a7b0c3f3cc Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 9 Sep 2018 14:00:53 +1200 Subject: [PATCH] Split _inject_greasemonkey_scripts to separate requirements. Because flake8 was complaining about cyclomatic complexity. --- qutebrowser/browser/webengine/webenginetab.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 85c3879d4..8fb7e4c9c 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -911,6 +911,15 @@ class _WebEngineScripts(QObject): scripts = self._greasemonkey.all_scripts() self._inject_greasemonkey_scripts(scripts) + def _remove_all_greasemonkey_scripts(self): + page_scripts = self._widget.page().scripts() + for script in page_scripts.toList(): + if script.name().startswith("GM-"): + log.greasemonkey.debug('Removing script: {}' + .format(script.name())) + removed = page_scripts.remove(script) + assert removed, script.name() + def _inject_greasemonkey_scripts(self, scripts=None, injection_point=None, remove_first=True): """Register user JavaScript files with the current tab. @@ -934,12 +943,7 @@ class _WebEngineScripts(QObject): # have been added elsewhere, like the one for stylesheets. page_scripts = self._widget.page().scripts() if remove_first: - for script in page_scripts.toList(): - if script.name().startswith("GM-"): - log.greasemonkey.debug('Removing script: {}' - .format(script.name())) - removed = page_scripts.remove(script) - assert removed, script.name() + self._remove_all_greasemonkey_scripts() if not scripts: return