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

Renamed is_whitelisted_host to is_whitelisted_url, removed unused try block

Browse Source
This commit is contained in:
Ellis 2018-09-18 13:17:02 -04:00
parent 9c8a299a60
commit c3d8f66673
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qutebrowser/browser/adblock.py
View File

@ -60,18 +60,15 @@ def get_fileobj(byte_io):
return byte_io return byte_io
def is_whitelisted_host(url): def is_whitelisted_url(url):
"""Check if the given url is on the adblock whitelist. """Check if the given url is on the adblock whitelist.
Args: Args:
url: The url to check in QUrl form. url: The url to check in QUrl form.
""" """
for pattern in config.val.content.host_blocking.whitelist: for pattern in config.val.content.host_blocking.whitelist:
try: if pattern.matches(url):
if pattern.matches(url): return True
return True
except urlmatch.ParseError:
log.misc.exception("Unable to read UrlPattern: " + str(url))
return False return False
@ -120,7 +117,7 @@ class HostBlocker:
host = url.host() host = url.host()
return ((host in self._blocked_hosts or return ((host in self._blocked_hosts or
host in self._config_blocked_hosts) and host in self._config_blocked_hosts) and
not is_whitelisted_host(url)) not is_whitelisted_url(url))
def _read_hosts_file(self, filename, target): def _read_hosts_file(self, filename, target):
"""Read hosts from the given filename. """Read hosts from the given filename.