From 15a2be877a573f45019d6075fb7d9d46ba0e0d93 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 6 Oct 2014 22:22:59 +0200 Subject: [PATCH] Pass win_id correctly with invalid_url_error. --- qutebrowser/browser/downloads.py | 2 +- qutebrowser/browser/quickmarks.py | 2 +- qutebrowser/utils/urlutils.py | 11 ++++++++--- qutebrowser/widgets/tabbedbrowser.py | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index bda4c2968..cfb8a01c0 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -362,7 +362,7 @@ class DownloadManager(QObject): page: The QWebPage to get the download from. """ if not url.isValid(): - urlutils.invalid_url_error(url, "start download") + urlutils.invalid_url_error('current', url, "start download") return req = QNetworkRequest(url) reply = page.networkAccessManager().get(req) diff --git a/qutebrowser/browser/quickmarks.py b/qutebrowser/browser/quickmarks.py index 17e55e098..e64e1bb6d 100644 --- a/qutebrowser/browser/quickmarks.py +++ b/qutebrowser/browser/quickmarks.py @@ -66,7 +66,7 @@ def prompt_save(win_id, url): url: The quickmark url as a QUrl. """ if not url.isValid(): - urlutils.invalid_url_error(url, "save quickmark") + urlutils.invalid_url_error(win_id, url, "save quickmark") return urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded) message.ask_async(win_id, "Add quickmark:", usertypes.PromptMode.text, diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index f95ac789b..beef63c6c 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -262,15 +262,20 @@ def qurl_from_user_input(urlstr): return QUrl('http://[{}]{}'.format(ipstr, rest)) -def invalid_url_error(url, action): - """Display an error message for an URL.""" +def invalid_url_error(win_id, url, action): + """Display an error message for an URL. + + Args: + win_id: The window ID to show the error message in. + action: The action which was interrupted by the error. + """ if url.isValid(): raise ValueError("Calling invalid_url_error with valid URL {}".format( url.toDisplayString())) errstring = "Trying to {} with invalid URL".format(action) if url.errorString(): errstring += " - {}".format(url.errorString()) - message.error(errstring) + message.error(win_id, errstring) class FuzzyUrlError(Exception): diff --git a/qutebrowser/widgets/tabbedbrowser.py b/qutebrowser/widgets/tabbedbrowser.py index 14635f1ad..a830b6449 100644 --- a/qutebrowser/widgets/tabbedbrowser.py +++ b/qutebrowser/widgets/tabbedbrowser.py @@ -259,7 +259,7 @@ class TabbedBrowser(tabwidget.TabWidget): entry = UndoEntry(tab.cur_url, history_data) self._undo_stack.append(entry) else: - urlutils.invalid_url_error(tab.cur_url, "saving tab") + urlutils.invalid_url_error(self._win_id, tab.cur_url, "saving tab") return tab.shutdown() self.removeTab(idx)