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

urlmatch: Fix handling of *:// as scheme

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-15 17:03:59 +01:00
parent a8a9cdd81e
commit 8fd0690959
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/utils/urlmatch.py
View File

@ -113,8 +113,12 @@ class UrlPattern:
def _init_scheme(self, parsed): def _init_scheme(self, parsed):
if not parsed.scheme: if not parsed.scheme:
raise ParseError("No scheme given") raise ParseError("No scheme given")
if parsed.scheme not in self.SCHEMES: elif parsed.scheme == 'any':
self._scheme = None
return
elif parsed.scheme not in self.SCHEMES:
raise ParseError("Unknown scheme {}".format(parsed.scheme)) raise ParseError("Unknown scheme {}".format(parsed.scheme))
self._scheme = parsed.scheme self._scheme = parsed.scheme
def _init_path(self, parsed): def _init_path(self, parsed):
@ -172,7 +176,7 @@ class UrlPattern:
allows_ports = {'https': True, 'http': True, 'ftp': True, allows_ports = {'https': True, 'http': True, 'ftp': True,
'file': False, 'chrome': False, 'qute': False, 'file': False, 'chrome': False, 'qute': False,
'about': False} 'about': False, None: True}
if not allows_ports[self._scheme] and self._port is not None: if not allows_ports[self._scheme] and self._port is not None:
raise ParseError("Ports are unsupported with {} scheme".format( raise ParseError("Ports are unsupported with {} scheme".format(
self._scheme)) self._scheme))