From 5e5b5cf9b4f5f60c3f30ef09729eec16879d4079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=92riks=20Karls?= Date: Sun, 10 Mar 2024 12:15:28 +0200 Subject: [PATCH] Style - shorten line length from 160 to 120 chars --- .editorconfig | 2 +- .flake8 | 4 ++-- pyproject.toml | 4 ++-- src/api_client/_base.py | 17 +++++++++++++---- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index 18b706d..1505fae 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,7 +3,7 @@ root = true [*] -max_line_length = 160 +max_line_length = 120 indent_style = space indent_size = 4 charset = utf-8 diff --git a/.flake8 b/.flake8 index 2643256..5c85899 100644 --- a/.flake8 +++ b/.flake8 @@ -1,4 +1,4 @@ [flake8] extend-ignore = E203, E704, W605, E701 -exclude = .git,__pycache__,venv,migrations -max-line-length = 160 +exclude = .git,__pycache__,venv +max-line-length = 120 diff --git a/pyproject.toml b/pyproject.toml index 65f980c..e8c5b3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ filename = "src/api_client/__init__.py" [tool.black] -line-length = 160 +line-length = 120 target-version = ['py311'] include = '\.pyi?$' extend-exclude = '''( @@ -69,7 +69,7 @@ workers = 4 [tool.isort] profile = "black" -line_length = 160 +line_length = 120 skip = ["migrations", "env", "venv", ".venv", ".git", "media"] diff --git a/src/api_client/_base.py b/src/api_client/_base.py index c9aef95..471b216 100644 --- a/src/api_client/_base.py +++ b/src/api_client/_base.py @@ -76,7 +76,9 @@ class BaseClient(ABC): self._debug_log_prepared_request(request) self._debug(f"Prepared {request.method} request to '{request.url}'", extra=request.__dict__) - self._info_log_request_sending(request, kwargs.get("content") or kwargs.get("files") or kwargs.get("data") or kwargs.get("json")) + self._info_log_request_sending( + request, kwargs.get("content") or kwargs.get("files") or kwargs.get("data") or kwargs.get("json") + ) return request def _debug_log_request(self, method: str, full_url: str) -> None: @@ -93,7 +95,10 @@ class BaseClient(ABC): def _info_log_response(self, response: httpx.Response) -> None: str_repr_content = response.content.decode("utf8")[:500] - self._info(f"Response {response.status_code=} {str_repr_content=}", extra={"status_code": response.status_code, "content": str_repr_content}) + self._info( + f"Response {response.status_code=} {str_repr_content=}", + extra={"status_code": response.status_code, "content": str_repr_content}, + ) def _info(self, msg: str, *args: Any, **kwargs: Any) -> None: self._log("INFO", f"[{self._nonce}] {msg}", *args, **kwargs) @@ -110,7 +115,11 @@ class BaseClient(ABC): def _critical(self, msg: str, *args: Any, **kwargs: Any) -> None: self._log("CRITICAL", f"[{self._nonce}] {msg}", *args, **kwargs) - def _log(self, level: str, msg: object, *args: object, stacklevel: int = 4, extra: dict | None = None, **kwargs: Any) -> None: + def _log( + self, level: str, msg: object, *args: object, stacklevel: int = 4, extra: dict | None = None, **kwargs: Any + ) -> None: extra = extra or {} extra.update(nonce=self._nonce) - self._logger.log(logging.getLevelNamesMapping()[level], msg, *args, stacklevel=stacklevel, extra=extra, **kwargs) + self._logger.log( + logging.getLevelNamesMapping()[level], msg, *args, stacklevel=stacklevel, extra=extra, **kwargs + )