Merge branch 'flvi0-master'

This commit is contained in:
Florian Bruhin 2015-03-11 17:49:14 +01:00
commit cd14ae2f1f
3 changed files with 10 additions and 2 deletions

View File

@ -137,10 +137,10 @@ Contributors, sorted by the number of commits in descending order:
* Peter Vilim
* John ShaggyTwoDope Jenkins
* rikn00
* Patric Schmitz
* Martin Zimmermann
* Error 800
* Brian Jackson
* Patric Schmitz
* Johannes Altmanninger
* Samir Benmendil
* Regina Hug

View File

@ -155,6 +155,7 @@ class IsUrlTests(unittest.TestCase):
'deadbeef',
'31c3',
'http:foo:0',
'foo::bar',
)
@mock.patch('qutebrowser.utils.urlutils.config', new=stubs.ConfigStub(

View File

@ -193,7 +193,14 @@ def _has_explicit_scheme(url):
Args:
url: The URL as QUrl.
"""
return url.isValid() and url.scheme() and not url.path().startswith(' ')
# Note that generic URI syntax actually would allow a second colon
# after the scheme delimiter. Since we don't know of any URIs
# using this and want to support e.g. searching for scoped C++
# symbols, we treat this as not an URI anyways.
return (url.isValid() and url.scheme()
and not url.path().startswith(' ')
and not url.path().startswith(':'))
def is_special_url(url):