From 4f2ae7f255611036bc2ff1f0b300e2ea43d7bf6b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 08:35:59 +0800 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#337) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 23.10.1 → 24.4.2](https://github.com/psf/black/compare/23.10.1...24.4.2) - [github.com/pycqa/isort: 5.12.0 → 5.13.2](https://github.com/pycqa/isort/compare/5.12.0...5.13.2) - [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.5.0...v4.6.0) - [github.com/asottile/pyupgrade: v3.15.0 → v3.15.2](https://github.com/asottile/pyupgrade/compare/v3.15.0...v3.15.2) - [github.com/pycqa/flake8: 6.1.0 → 7.0.0](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 10 ++++---- tomlkit/_types.py | 3 +-- tomlkit/container.py | 8 +++--- tomlkit/items.py | 56 +++++++++++++++-------------------------- tomlkit/parser.py | 6 ++--- 5 files changed, 34 insertions(+), 49 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 25cb85d..db90617 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,17 +1,17 @@ repos: - repo: https://github.com/psf/black - rev: 23.10.1 + rev: 24.4.2 hooks: - id: black - repo: https://github.com/pycqa/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort exclude: docs/.* - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace exclude: ^tests/(toml-test|toml-spec-tests)/.* @@ -37,13 +37,13 @@ repos: exclude: ^tomlkit/items\.py - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.2 hooks: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/pycqa/flake8 - rev: 6.1.0 + rev: 7.0.0 hooks: - id: flake8 additional_dependencies: *flake8_deps diff --git a/tomlkit/_types.py b/tomlkit/_types.py index 8eeb75e..8ff79fa 100644 --- a/tomlkit/_types.py +++ b/tomlkit/_types.py @@ -31,8 +31,7 @@ P = ParamSpec("P") class WrapperType(Protocol): - def _new(self: WT, value: Any) -> WT: - ... + def _new(self: WT, value: Any) -> WT: ... else: from collections.abc import MutableMapping diff --git a/tomlkit/container.py b/tomlkit/container.py index 78f0764..6692a72 100644 --- a/tomlkit/container.py +++ b/tomlkit/container.py @@ -251,9 +251,11 @@ def append( for k, v in item.value.body: current.append(k, v) self._body[ - current_idx[-1] - if isinstance(current_idx, tuple) - else current_idx + ( + current_idx[-1] + if isinstance(current_idx, tuple) + else current_idx + ) ] = (current_body_element[0], current) return self diff --git a/tomlkit/items.py b/tomlkit/items.py index 1624c28..c483eed 100644 --- a/tomlkit/items.py +++ b/tomlkit/items.py @@ -54,67 +54,57 @@ class _ConvertError(TypeError, ValueError): @overload -def item(value: bool, _parent: Item | None = ..., _sort_keys: bool = ...) -> Bool: - ... +def item(value: bool, _parent: Item | None = ..., _sort_keys: bool = ...) -> Bool: ... @overload -def item(value: int, _parent: Item | None = ..., _sort_keys: bool = ...) -> Integer: - ... +def item(value: int, _parent: Item | None = ..., _sort_keys: bool = ...) -> Integer: ... @overload -def item(value: float, _parent: Item | None = ..., _sort_keys: bool = ...) -> Float: - ... +def item(value: float, _parent: Item | None = ..., _sort_keys: bool = ...) -> Float: ... @overload -def item(value: str, _parent: Item | None = ..., _sort_keys: bool = ...) -> String: - ... +def item(value: str, _parent: Item | None = ..., _sort_keys: bool = ...) -> String: ... @overload def item( value: datetime, _parent: Item | None = ..., _sort_keys: bool = ... -) -> DateTime: - ... +) -> DateTime: ... @overload -def item(value: date, _parent: Item | None = ..., _sort_keys: bool = ...) -> Date: - ... +def item(value: date, _parent: Item | None = ..., _sort_keys: bool = ...) -> Date: ... @overload -def item(value: time, _parent: Item | None = ..., _sort_keys: bool = ...) -> Time: - ... +def item(value: time, _parent: Item | None = ..., _sort_keys: bool = ...) -> Time: ... @overload def item( value: Sequence[dict], _parent: Item | None = ..., _sort_keys: bool = ... -) -> AoT: - ... +) -> AoT: ... @overload -def item(value: Sequence, _parent: Item | None = ..., _sort_keys: bool = ...) -> Array: - ... +def item( + value: Sequence, _parent: Item | None = ..., _sort_keys: bool = ... +) -> Array: ... @overload -def item(value: dict, _parent: Array = ..., _sort_keys: bool = ...) -> InlineTable: - ... +def item(value: dict, _parent: Array = ..., _sort_keys: bool = ...) -> InlineTable: ... @overload -def item(value: dict, _parent: Item | None = ..., _sort_keys: bool = ...) -> Table: - ... +def item(value: dict, _parent: Item | None = ..., _sort_keys: bool = ...) -> Table: ... @overload -def item(value: ItemT, _parent: Item | None = ..., _sort_keys: bool = ...) -> ItemT: - ... +def item(value: ItemT, _parent: Item | None = ..., _sort_keys: bool = ...) -> ItemT: ... def item(value: Any, _parent: Item | None = None, _sort_keys: bool = False) -> Item: @@ -1457,23 +1447,19 @@ def value(self) -> container.Container: return self._value @overload - def append(self: AT, key: None, value: Comment | Whitespace) -> AT: - ... + def append(self: AT, key: None, value: Comment | Whitespace) -> AT: ... @overload - def append(self: AT, key: Key | str, value: Any) -> AT: - ... + def append(self: AT, key: Key | str, value: Any) -> AT: ... def append(self, key, value): raise NotImplementedError @overload - def add(self: AT, key: Comment | Whitespace) -> AT: - ... + def add(self: AT, key: Comment | Whitespace) -> AT: ... @overload - def add(self: AT, key: Key | str, value: Any = ...) -> AT: - ... + def add(self: AT, key: Key | str, value: Any = ...) -> AT: ... def add(self, key, value=None): if value is None: @@ -1874,12 +1860,10 @@ def __len__(self) -> int: return len(self._body) @overload - def __getitem__(self, key: slice) -> list[Table]: - ... + def __getitem__(self, key: slice) -> list[Table]: ... @overload - def __getitem__(self, key: int) -> Table: - ... + def __getitem__(self, key: int) -> Table: ... def __getitem__(self, key): return self._body[key] diff --git a/tomlkit/parser.py b/tomlkit/parser.py index 89ddae2..cb71841 100644 --- a/tomlkit/parser.py +++ b/tomlkit/parser.py @@ -981,9 +981,9 @@ def _parse_table( is_aot and i == len(name_parts) - 2, is_super_table=i < len(name_parts) - 2, name=_name.key, - display_name=full_key.as_string() - if i == len(name_parts) - 2 - else None, + display_name=( + full_key.as_string() if i == len(name_parts) - 2 else None + ), ), )