Rename urlutils.safe_display_url to safe_display_string

qutebrowser/mainwindow/statusbar/url.py

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

qutebrowser/utils/urlutils.py

@@ -592,7 +592,7 @@ def data_url(mimetype, data):
     return url
 
 
-def safe_display_url(qurl):
+def safe_display_string(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

tests/unit/mainwindow/statusbar/test_url.py

@@ -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)
     url_widget.on_tab_changed(tab_widget)
     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', [

tests/unit/utils/test_urlutils.py

@@ -758,13 +758,13 @@ def test_data_url():
     (QUrl('http://www.xn--80ak6aa92e.com'),
         '(unparseable URL!) http://www.аррӏе.com'),
 ])
-def test_safe_display_url(url, expected):
-    assert urlutils.safe_display_url(url) == expected
+def test_safe_display_string(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):
-        urlutils.safe_display_url(QUrl())
+        urlutils.safe_display_string(QUrl())
 
 
 class TestProxyFromUrl: