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

Rename urlutils.safe_display_url to safe_display_string

Browse Source
This commit is contained in:
Florian Bruhin 2017-04-24 07:49:12 +02:00
parent b632fe3285
commit 52f31ed15c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/mainwindow/statusbar/url.py
View File

@ -141,7 +141,7 @@ class UrlText(textbase.TextBase):
elif not url.isValid(): elif not url.isValid():
self._normal_url = "Invalid URL!" self._normal_url = "Invalid URL!"
else: else:
self._normal_url = urlutils.safe_display_url(url) self._normal_url = urlutils.safe_display_string(url)
self._normal_url_type = UrlType.normal self._normal_url_type = UrlType.normal
self._update_url() self._update_url()
@ -158,7 +158,7 @@ class UrlText(textbase.TextBase):
if link: if link:
qurl = QUrl(link) qurl = QUrl(link)
if qurl.isValid(): if qurl.isValid():
self._hover_url = urlutils.safe_display_url(qurl) self._hover_url = urlutils.safe_display_string(qurl)
else: else:
self._hover_url = '(invalid URL!) {}'.format(link) self._hover_url = '(invalid URL!) {}'.format(link)
else: else:
@ -170,7 +170,7 @@ class UrlText(textbase.TextBase):
"""Update URL if the tab changed.""" """Update URL if the tab changed."""
self._hover_url = None self._hover_url = None
if tab.url().isValid(): if tab.url().isValid():
self._normal_url = urlutils.safe_display_url(tab.url()) self._normal_url = urlutils.safe_display_string(tab.url())
else: else:
self._normal_url = '' self._normal_url = ''
self.on_load_status_changed(tab.load_status().name) self.on_load_status_changed(tab.load_status().name)

2
qutebrowser/utils/urlutils.py
View File

@ -592,7 +592,7 @@ def data_url(mimetype, data):
return url return url
def safe_display_url(qurl): def safe_display_string(qurl):
"""Get a IDN-homograph phising safe form of the given QUrl. """Get a IDN-homograph phising safe form of the given QUrl.
If we're dealing with a Punycode-encoded URL, this prepends the hostname in If we're dealing with a Punycode-encoded URL, this prepends the hostname in

2
tests/unit/mainwindow/statusbar/test_url.py
View File

@ -116,7 +116,7 @@ def test_on_tab_changed(url_widget, fake_web_tab, load_status, qurl):
tab_widget = fake_web_tab(load_status=load_status, url=qurl) tab_widget = fake_web_tab(load_status=load_status, url=qurl)
url_widget.on_tab_changed(tab_widget) url_widget.on_tab_changed(tab_widget)
assert url_widget._urltype == load_status assert url_widget._urltype == load_status
assert url_widget.text() == urlutils.safe_display_url(qurl) assert url_widget.text() == urlutils.safe_display_string(qurl)
@pytest.mark.parametrize('qurl, load_status, expected_status', [ @pytest.mark.parametrize('qurl, load_status, expected_status', [

8
tests/unit/utils/test_urlutils.py
View File

@ -758,13 +758,13 @@ def test_data_url():
(QUrl('http://www.xn--80ak6aa92e.com'), (QUrl('http://www.xn--80ak6aa92e.com'),
'(unparseable URL!) http://www.аррӏе.com'), '(unparseable URL!) http://www.аррӏе.com'),
]) ])
def test_safe_display_url(url, expected): def test_safe_display_string(url, expected):
assert urlutils.safe_display_url(url) == expected assert urlutils.safe_display_string(url) == expected
def test_safe_display_url_invalid(): def test_safe_display_string_invalid():
with pytest.raises(urlutils.InvalidUrlError): with pytest.raises(urlutils.InvalidUrlError):
urlutils.safe_display_url(QUrl()) urlutils.safe_display_string(QUrl())
class TestProxyFromUrl: class TestProxyFromUrl: