From 64c1fa2c91b55a35eceeffab6e0715374a5a7231 Mon Sep 17 00:00:00 2001 From: dm Date: Thu, 17 Feb 2022 10:44:09 +0800 Subject: fix: black lint --- adblock/adblock.pyi | 15 ++++++++++++--- tests/test_exceptions.py | 3 ++- tests/test_redirect.py | 23 ++++++++++++++++------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/adblock/adblock.pyi b/adblock/adblock.pyi index 83d2492..4ed340c 100644 --- a/adblock/adblock.pyi +++ b/adblock/adblock.pyi @@ -47,15 +47,24 @@ class UrlSpecificResources: class FilterSet: def __init__(self, debug: bool = False) -> None: pass - def add_filter_list(self, filter_list: str, format: str = "standard", include_redirect_urls: bool = False) -> None: + def add_filter_list( + self, + filter_list: str, + format: str = "standard", + include_redirect_urls: bool = False, + ) -> None: pass - def add_filters(self, filters: List[str], format: str = "standard", include_redirect_urls: bool = False) -> None: + def add_filters( + self, + filters: List[str], + format: str = "standard", + include_redirect_urls: bool = False, + ) -> None: pass class Engine: def __init__(self, filter_set: FilterSet, optimize: bool = True) -> None: pass - def check_network_urls( self, url: str, source_url: str, request_type: str ) -> BlockerResult: diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 3e3dc9f..2efe2b2 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -1,6 +1,7 @@ import adblock import pytest + def test_correct_baseclasses(): assert issubclass(adblock.AdblockException, Exception) assert issubclass(adblock.BlockerException, adblock.AdblockException) @@ -17,6 +18,6 @@ def test_add_resource_error(): engine = adblock.Engine(filter_set=filter_set) with pytest.raises(adblock.AddResourceError) as exc: - engine.add_resource(name='aa', content_type="image/jpeg", content="111") + engine.add_resource(name="aa", content_type="image/jpeg", content="111") assert "invalid base64 content" in str(exc.value) diff --git a/tests/test_redirect.py b/tests/test_redirect.py index a99a728..cca3a91 100644 --- a/tests/test_redirect.py +++ b/tests/test_redirect.py @@ -4,7 +4,9 @@ import adblock def test_redirect_worked_as_excepted_with_include_redirect_urls(): # https://github.com/brave/adblock-rust/blob/b7f29af8c0a0d000201d8d769b6a0b25a9dd4e89/src/blocker.rs#L1242 filter_set = adblock.FilterSet() - filter_set.add_filter_list("||foo.com$important,redirect-url=http://xyz.com", include_redirect_urls=True) + filter_set.add_filter_list( + "||foo.com$important,redirect-url=http://xyz.com", include_redirect_urls=True + ) engine = adblock.Engine(filter_set=filter_set) @@ -18,7 +20,9 @@ def test_redirect_worked_as_excepted_with_include_redirect_urls(): def test_redirect_url_is_not_recognized_without_include_redirect_urls(): # https://github.com/brave/adblock-rust/blob/b7f29af8c0a0d000201d8d769b6a0b25a9dd4e89/src/blocker.rs#L1267 filter_set2 = adblock.FilterSet() - filter_set2.add_filter_list("||foo.com$important,redirect-url=http://xyz.com", include_redirect_urls=False) + filter_set2.add_filter_list( + "||foo.com$important,redirect-url=http://xyz.com", include_redirect_urls=False + ) engine2 = adblock.Engine(filter_set=filter_set2) @@ -36,13 +40,15 @@ def test_redirect_url_exception(): ||imdb-video.media-imdb.com$media,redirect-url=http://xyz.com @@||imdb-video.media-imdb.com^$domain=imdb.com """, - include_redirect_urls=True + include_redirect_urls=True, ) engine2 = adblock.Engine(filter_set=filter_set, optimize=False) res = engine2.check_network_urls( - "https://imdb-video.media-imdb.com/kBOeI88k1o23eNAi", "https://www.imdb.com/video/13", "media" + "https://imdb-video.media-imdb.com/kBOeI88k1o23eNAi", + "https://www.imdb.com/video/13", + "media", ) assert res.matched is False assert res.redirect == "http://xyz.com" @@ -55,14 +61,17 @@ def test_redirect_with_custom_resource(): filters.add_filter_list("-advertisement-$redirect=test\n") engine = adblock.Engine(filter_set=filters) - engine.add_resource(name="test", content_type="application/javascript", content="YWxlcnQoMSk=") + engine.add_resource( + name="test", content_type="application/javascript", content="YWxlcnQoMSk=" + ) result = engine.check_network_urls( - url="http://example.com/-advertisement-icon.", source_url="example.com", request_type="image", + url="http://example.com/-advertisement-icon.", + source_url="example.com", + request_type="image", ) assert result.matched assert not result.exception assert not result.important assert result.redirect == "data:application/javascript;base64,YWxlcnQoMSk=" - -- cgit v1.2.3