From ca0c892cbc31aff0fa3628918600b2cf21de70f0 Mon Sep 17 00:00:00 2001 From: Ellis Date: Mon, 17 Sep 2018 12:40:56 -0400 Subject: [PATCH] Fixed passing UrlPattern Object into itself --- qutebrowser/browser/adblock.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index 07d14b03f..f919424f8 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -27,9 +27,8 @@ import zipfile from qutebrowser.browser import downloads from qutebrowser.config import config -from qutebrowser.utils import objreg, standarddir, log, message +from qutebrowser.utils import objreg, standarddir, log, message, urlmatch from qutebrowser.commands import cmdutils -from qutebrowser.utils import urlmatch def guess_zip_filename(zf): @@ -68,8 +67,11 @@ def is_whitelisted_host(url): url: The url to check in QUrl form. """ for pattern in config.val.content.host_blocking.whitelist: - if urlmatch.UrlPattern(pattern).matches(url): - return True + try: + if pattern.matches(url): + return True + except urlmatch.ParseError as p_error: + log.misc.exception("Unable to read UrlPattern: " + UrlPattern._pattern) return False