From b776aeac84bd926673612102b6a2fd10dc10bd3d Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Fri, 20 Nov 2015 19:10:14 +0100 Subject: [PATCH] Use same representation in webview and quteprocess Otherwise the "page loaded" message will not be recognized. Also use percent-encoding to avoid unicode-related bugs on different systems. --- qutebrowser/browser/webview.py | 2 +- tests/integration/quteprocess.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qutebrowser/browser/webview.py b/qutebrowser/browser/webview.py index 54620a0fd..ede9f9a88 100644 --- a/qutebrowser/browser/webview.py +++ b/qutebrowser/browser/webview.py @@ -159,7 +159,7 @@ class WebView(QWebView): return page def __repr__(self): - url = utils.elide(self.url().toDisplayString(), 100) + url = utils.elide(self.url().toDisplayString(QUrl.EncodeUnicode), 100) return utils.get_repr(self, tab_id=self.tab_id, url=url) def __del__(self): diff --git a/tests/integration/quteprocess.py b/tests/integration/quteprocess.py index 8f664ad82..910f73950 100644 --- a/tests/integration/quteprocess.py +++ b/tests/integration/quteprocess.py @@ -35,7 +35,7 @@ from PyQt5.QtCore import pyqtSignal, QUrl import testprocess # pylint: disable=import-error from qutebrowser.misc import ipc -from qutebrowser.utils import log +from qutebrowser.utils import log, utils def is_ignored_qt_message(message): @@ -229,7 +229,9 @@ class QuteProc(testprocess.Process): def wait_for_load_finished(self, path, timeout=15000): """Wait until any tab has finished loading.""" url = self._path_to_url(path) - url = QUrl(url).toString() + # We really need the same representation that the webview uses in its + # __repr__ + url = utils.elide(QUrl(url).toDisplayString(QUrl.EncodeUnicode), 100) pattern = re.compile( r"(load status for : LoadStatus.success|fetch: "