diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py index 9dc6cd9bf..28cfac0fb 100644 --- a/qutebrowser/mainwindow/tabwidget.py +++ b/qutebrowser/mainwindow/tabwidget.py @@ -165,8 +165,6 @@ class TabWidget(QTabWidget): fields['perc_raw'] = tab.progress() fields['backend'] = objects.backend.name fields['private'] = ' [Private Mode] ' if tab.private else '' - - url = self.tab_url(idx) if tab.load_status() == usertypes.LoadStatus.loading: fields['perc'] = '[{}%] '.format(tab.progress()) @@ -174,19 +172,15 @@ class TabWidget(QTabWidget): fields['perc'] = '' try: - fields['host'] = url.host() + url = self.tab_url(idx) except qtutils.QtValueError: fields['host'] = '' - - try: - fields['current_url'] = url.url() - except qtutils.QtValueError: fields['current_url'] = '' - - try: - fields['protocol'] = url.scheme() - except qtutils.QtValueError: fields['protocol'] = '' + else: + fields['host'] = url.host() + fields['current_url'] = url.toDisplayString() + fields['protocol'] = url.scheme() y = tab.scroller.pos_perc()[1] if y is None: diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py index d2c0fd746..ede073130 100644 --- a/tests/helpers/stubs.py +++ b/tests/helpers/stubs.py @@ -131,7 +131,8 @@ class FakeUrl: """QUrl stub which provides .path(), isValid() and host().""" - def __init__(self, path=None, valid=True, host=None, url=None, scheme=None): + def __init__(self, path=None, valid=True, host=None, url=None, + scheme=None): self.path = mock.Mock(return_value=path) self.isValid = mock.Mock(returl_value=valid) self.host = mock.Mock(returl_value=host)