diff --git a/grab/client.py b/grab/client.py index 033030d1..ddbb3e79 100644 --- a/grab/client.py +++ b/grab/client.py @@ -1,6 +1,5 @@ from __future__ import annotations -from pprint import pprint # pylint: disable=unused-import from typing import Any from .base import BaseClient diff --git a/grab/document.py b/grab/document.py index 35e68998..1ba3896b 100644 --- a/grab/document.py +++ b/grab/document.py @@ -144,7 +144,7 @@ def process_encoding(self, encoding: None | str = None) -> str: return unicodec.detect_content_encoding( self.get_body_chunk() or b"", content_type_header=( - self.headers.get("Content-Type", None) if self.headers else None + self.headers.get("Content-Type") if self.headers else None ), markup="xml" if self.document_type == "xml" else "html", ) @@ -262,8 +262,7 @@ def rex_text( if default is UNDEFINED: raise DataNotFound("Regexp not found") from ex return default - else: - return match.group(1) + return match.group(1) def rex_search( self, diff --git a/grab/request.py b/grab/request.py index ec069809..ee5bf838 100644 --- a/grab/request.py +++ b/grab/request.py @@ -2,7 +2,7 @@ from collections.abc import Mapping, MutableMapping from copy import copy -from typing import Any, TypedDict, cast +from typing import Any, TypedDict from urllib.parse import urlencode from urllib3.filepost import encode_multipart_formdata @@ -139,10 +139,9 @@ def compile_request_data( # noqa: CCR001 "Request.body and Request.fields could not be set both" ) if self.multipart: - req_body, content_type = encode_multipart_formdata( # type: ignore + req_body, content_type = encode_multipart_formdata( self.fields ) - req_body = cast(bytes, req_body) else: req_body, content_type = ( urlencode(self.fields).encode(), diff --git a/grab/spider/base.py b/grab/spider/base.py index e84394f2..66ba5bf6 100644 --- a/grab/spider/base.py +++ b/grab/spider/base.py @@ -442,7 +442,7 @@ def process_grab_proxy(self, task: Task, grab: Grab) -> None: if self.proxy_auto_change: self.change_active_proxy(task, grab) if self.proxy: - raise Exception("Look like it is not called from tests") + raise RuntimeError("Look like it is not called from tests") # grab.zzzz( # proxy=self.proxy.get_address(), # proxy_userpwd=self.proxy.get_userpwd(), diff --git a/tests/test_spider_stat.py b/tests/test_spider_stat.py index 04cc661e..aa82d022 100644 --- a/tests/test_spider_stat.py +++ b/tests/test_spider_stat.py @@ -19,7 +19,7 @@ def task_page_valid(self, _doc: Document, _task: Task) -> None: self.stat.inc("foo") def task_page_fail(self, _doc: Document, _task: Task) -> None: - raise Exception("Shit happens!") + raise RuntimeError("Shit happens!") self.server.add_response(Response(), count=2) bot = TestSpider() diff --git a/tests/util.py b/tests/util.py index 619d0b9d..5dc37e2a 100644 --- a/tests/util.py +++ b/tests/util.py @@ -40,7 +40,7 @@ def load_test_config() -> MutableMapping[str, Any]: else: for key, val in local_config.items(): if key in DEFAULT_CONFIG: - raise Exception("Invalid config key: {}".format(key)) + raise KeyError("Invalid config key: {}".format(key)) config[key] = val return config