From 8809ef02a109e3dc590020301cf7858a5414679a Mon Sep 17 00:00:00 2001 From: George Edward Bulmer Date: Sat, 24 Mar 2018 20:20:16 +0000 Subject: [PATCH] Add support for more than 1 host on a given line --- qutebrowser/browser/adblock.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index 8328a8a76..1cee34f25 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -228,16 +228,13 @@ class HostBlocker: parts = line.split() if len(parts) == 1: # "one host per line" format - host = parts[0] - elif len(parts) == 2: - # /etc/hosts format - host = parts[1] + hosts = [parts[0]] else: - log.misc.error("Failed to parse: {!r}".format(line)) - return False + hosts = parts[1:] - if '.' in host and not host.endswith('.localdomain'): - self._blocked_hosts.add(host) + for host in hosts: + if '.' in host and not host.endswith('.localdomain'): + self._blocked_hosts.add(host) return True