From 523e071a9725f4f17e2980d754a634e795e11d41 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 16 Sep 2015 17:04:19 +0200 Subject: [PATCH] Stylistic changes to is_whitelisted_domain --- qutebrowser/browser/adblock.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index 0f4b50b75..774e154fd 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -25,7 +25,6 @@ import functools import posixpath import zipfile import fnmatch -import re from qutebrowser.config import config from qutebrowser.utils import objreg, standarddir, log, message @@ -67,14 +66,12 @@ def is_whitelisted_domain(host): Args: host: The host as given by the adblocker as string. """ - whitelist = objreg.get('config').get('content', 'host-blocking-whitelist') + whitelist = config.get('content', 'host-blocking-whitelist') if whitelist is None: return False - for domain in whitelist: - fnmatch_translated = fnmatch.translate(domain) - domain_regex = re.compile(fnmatch_translated, re.IGNORECASE) - if domain_regex.match(host): + for pattern in whitelist: + if fnmatch.fnmatch(host, pattern.lower()): return True return False