rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move qtutils.ensure_valid in WebView.openurl

Browse Source
This commit is contained in:
Florian Bruhin 2016-07-11 16:32:24 +02:00
parent e80475ed57
commit 8b67d68d4a
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/browser/browsertab.py
View File

@ -27,7 +27,7 @@ from PyQt5.QtWidgets import QWidget, QLayout
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
from qutebrowser.config import config 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) tab_id_gen = itertools.count(0)
@ -546,6 +546,10 @@ class AbstractTab(QWidget):
def load_status(self): def load_status(self):
return self._load_status return self._load_status
def _openurl_prepare(self, url):
qtutils.ensure_valid(url)
self.title_changed.emit(url.toDisplayString())
def openurl(self, url): def openurl(self, url):
raise NotImplementedError raise NotImplementedError

2
qutebrowser/browser/webengine/webenginetab.py
View File

@ -261,7 +261,7 @@ class WebEngineTab(browsertab.AbstractTab):
self.backend = usertypes.Backend.QtWebEngine self.backend = usertypes.Backend.QtWebEngine
def openurl(self, url): def openurl(self, url):
self.title_changed.emit(url.toDisplayString()) self._openurl_prepare(url)
self._widget.load(url) self._widget.load(url)
def url(self): def url(self):

2
qutebrowser/browser/webkit/webkittab.py
View File

@ -467,7 +467,7 @@ class WebKitTab(browsertab.AbstractTab):
self.backend = usertypes.Backend.QtWebKit self.backend = usertypes.Backend.QtWebKit
def openurl(self, url): def openurl(self, url):
self.title_changed.emit(url.toDisplayString()) self._openurl_prepare(url)
self._widget.openurl(url) self._widget.openurl(url)
def url(self): def url(self):

1
qutebrowser/browser/webkit/webview.py
View File

@ -278,7 +278,6 @@ class WebView(QWebView):
Args: Args:
url: The URL to load as QUrl url: The URL to load as QUrl
""" """
qtutils.ensure_valid(url)
self.load(url) self.load(url)
if url.scheme() == 'qute': if url.scheme() == 'qute':
frame = self.page().mainFrame() frame = self.page().mainFrame()