From eca1fb7d3bfdb1844abcd6c97b978ad623118443 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 12 Feb 2018 17:54:34 +0100 Subject: [PATCH] Update hostblock_blame.py for new config --- scripts/hostblock_blame.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py index dde83d91f..f8c266b53 100644 --- a/scripts/hostblock_blame.py +++ b/scripts/hostblock_blame.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -# Copyright 2014-2017 Florian Bruhin (The Compiler) +# Copyright 2014-2018 Florian Bruhin (The Compiler) # # This file is part of qutebrowser. # @@ -27,10 +27,9 @@ import os.path import configparser import urllib.request -from PyQt5.QtCore import QStandardPaths - sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir)) from qutebrowser.browser import adblock +from qutebrowser.config import configdata def main(): @@ -38,18 +37,10 @@ def main(): if len(sys.argv) != 2: print("Usage: {} ".format(sys.argv[0]), file=sys.stderr) sys.exit(1) - confdir = QStandardPaths.writableLocation(QStandardPaths.ConfigLocation) - confdir = confdir.replace('/', os.sep) - if confdir.split(os.sep)[-1] != 'qutebrowser': - confdir = os.path.join(confdir, 'qutebrowser') - confpath = os.path.join(confdir, 'qutebrowser.conf') - parser = configparser.ConfigParser() - print("config path: {}".format(confpath)) - successful = parser.read(confpath, encoding='utf-8') - if not successful: - raise OSError("configparser did not read files successfully!") - lists = parser['content']['host-block-lists'] - for url in lists.split(','): + + configdata.init() + + for url in configdata.DATA['content.host_blocking.lists'].default: print("checking {}...".format(url)) raw_file = urllib.request.urlopen(url) byte_io = io.BytesIO(raw_file.read())