From 8b67d68d4ad741a3a7c7b2c5f0f6f4db221581d9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 11 Jul 2016 16:32:24 +0200 Subject: [PATCH] Move qtutils.ensure_valid in WebView.openurl --- qutebrowser/browser/browsertab.py | 6 +++++- qutebrowser/browser/webengine/webenginetab.py | 2 +- qutebrowser/browser/webkit/webkittab.py | 2 +- qutebrowser/browser/webkit/webview.py | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index c968f9cb9..abc89b461 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -27,7 +27,7 @@ from PyQt5.QtWidgets import QWidget, QLayout from qutebrowser.keyinput import modeman from qutebrowser.config import config -from qutebrowser.utils import utils, objreg, usertypes, message, log +from qutebrowser.utils import utils, objreg, usertypes, message, log, qtutils tab_id_gen = itertools.count(0) @@ -546,6 +546,10 @@ class AbstractTab(QWidget): def load_status(self): return self._load_status + def _openurl_prepare(self, url): + qtutils.ensure_valid(url) + self.title_changed.emit(url.toDisplayString()) + def openurl(self, url): raise NotImplementedError diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 162064dfd..66ae42318 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -261,7 +261,7 @@ class WebEngineTab(browsertab.AbstractTab): self.backend = usertypes.Backend.QtWebEngine def openurl(self, url): - self.title_changed.emit(url.toDisplayString()) + self._openurl_prepare(url) self._widget.load(url) def url(self): diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index c56ca2aac..7ccd465a5 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -467,7 +467,7 @@ class WebKitTab(browsertab.AbstractTab): self.backend = usertypes.Backend.QtWebKit def openurl(self, url): - self.title_changed.emit(url.toDisplayString()) + self._openurl_prepare(url) self._widget.openurl(url) def url(self): diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py index 289a715a7..70dc28528 100644 --- a/qutebrowser/browser/webkit/webview.py +++ b/qutebrowser/browser/webkit/webview.py @@ -278,7 +278,6 @@ class WebView(QWebView): Args: url: The URL to load as QUrl """ - qtutils.ensure_valid(url) self.load(url) if url.scheme() == 'qute': frame = self.page().mainFrame()