From 3f8958054bdebde63e10337e866c148be1f5bfe6 Mon Sep 17 00:00:00 2001 From: Ellis Date: Sun, 16 Sep 2018 19:41:49 -0400 Subject: [PATCH] Fixed is_whitelisted_host to use QUrl fixes #4179 --- qutebrowser/browser/adblock.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index e265b74f0..bb859454b 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -66,10 +66,10 @@ def is_whitelisted_host(url): """Check if the given url is on the adblock whitelist. Args: - url: The url to check. + url: The url to check in QUrl form. """ for pattern in config.val.content.host_blocking.whitelist: - if urlmatch.URLPattern(pattern).matches(url): + if urlmatch.UrlPattern(pattern).matches(url): return True return False @@ -119,7 +119,7 @@ class HostBlocker: host = url.host() return ((host in self._blocked_hosts or host in self._config_blocked_hosts) and - not is_whitelisted_host(url.toString())) + not is_whitelisted_host(url)) def _read_hosts_file(self, filename, target): """Read hosts from the given filename.