diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-12-22 14:39:43 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-12-22 14:39:43 +0100 |
| commit | 5981a532673e0670d104746c292e0f7b319563eb (patch) | |
| tree | ba7716f5342f8f10730fe1735c40083fb374d5bf /scripts | |
| parent | 1c9bb926c62abea0c8f11c35ca86d87ee896598c (diff) | |
| parent | db8901f3e5ea3ccb40cd0120803643aa81b86032 (diff) | |
| download | qutebrowser-5981a532673e0670d104746c292e0f7b319563eb.tar.gz qutebrowser-5981a532673e0670d104746c292e0f7b319563eb.zip | |
Merge remote-tracking branch 'origin/pr/5317' into dev
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dev/recompile_requirements.py | 1 | ||||
| -rwxr-xr-x | scripts/dev/run_vulture.py | 5 | ||||
| -rw-r--r-- | scripts/hostblock_blame.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py index 3b7c227f2..5cda4b3d7 100644 --- a/scripts/dev/recompile_requirements.py +++ b/scripts/dev/recompile_requirements.py @@ -173,6 +173,7 @@ CHANGELOG_URLS = { 'jinja2-pluralize': 'https://github.com/audreyfeldroy/jinja2_pluralize/blob/master/HISTORY.rst', 'mypy-extensions': 'https://github.com/python/mypy_extensions/commits/master', 'pyroma': 'https://github.com/regebro/pyroma/blob/master/HISTORY.txt', + 'adblock': 'https://github.com/ArniDagur/python-adblock/blob/master/CHANGELOG.md', 'pyPEG2': None, 'importlib-resources': 'https://importlib-resources.readthedocs.io/en/latest/changelog%20%28links%29.html', } diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py index 5e42febd4..194381421 100755 --- a/scripts/dev/run_vulture.py +++ b/scripts/dev/run_vulture.py @@ -135,7 +135,10 @@ def whitelist_generator(): # noqa: C901 yield 'scripts.importer.import_moz_places.places.row_factory' # component hooks - yield 'qutebrowser.components.adblock.on_config_changed' + yield 'qutebrowser.components.adblock.on_lists_changed' + yield 'qutebrowser.components.braveadblock.on_lists_changed' + yield 'qutebrowser.components.adblock.on_method_changed' + yield 'qutebrowser.components.braveadblock.on_method_changed' # used in type comments yield 'pending_download_type' diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py index 2949b9e78..c3da64729 100644 --- a/scripts/hostblock_blame.py +++ b/scripts/hostblock_blame.py @@ -39,7 +39,7 @@ def main(): configdata.init() - for url in configdata.DATA['content.host_blocking.lists'].default: + for url in configdata.DATA['content.blocking.hosts.lists'].default: print("checking {}...".format(url)) raw_file = urllib.request.urlopen(url) byte_io = io.BytesIO(raw_file.read()) |