From d599c208f4f537c6e66dc7467d9a0362baa1a18c Mon Sep 17 00:00:00 2001 From: Antti Kaihola <13725+akaihola@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:30:54 +0200 Subject: [PATCH] test: satisfy updated linters --- src/darker/black_diff.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/darker/black_diff.py b/src/darker/black_diff.py index b9c106648..6cccb9495 100644 --- a/src/darker/black_diff.py +++ b/src/darker/black_diff.py @@ -32,10 +32,21 @@ based on whether reformats touch user-edited lines """ + +from __future__ import annotations + import inspect import logging -from pathlib import Path -from typing import Collection, Optional, Pattern, Set, Tuple, TypedDict, Union +from typing import ( + TYPE_CHECKING, + Collection, + Optional, + Pattern, + Set, + Tuple, + TypedDict, + Union, +) # `FileMode as Mode` required to satisfy mypy==0.782. Strange. from black import FileMode as Mode @@ -56,6 +67,9 @@ from darkgraylib.config import ConfigurationError from darkgraylib.utils import TextDocument +if TYPE_CHECKING: + from pathlib import Path + __all__ = ["BlackConfig", "Mode", "run_black"] logger = logging.getLogger(__name__) @@ -69,9 +83,9 @@ class BlackConfig(TypedDict, total=False): """Type definition for Black configuration dictionaries""" config: str - exclude: Pattern[str] - extend_exclude: Pattern[str] - force_exclude: Pattern[str] + exclude: Pattern[str] | None + extend_exclude: Pattern[str] | None + force_exclude: Pattern[str] | None target_version: Union[str, Set[str]] line_length: int skip_string_normalization: bool @@ -164,7 +178,7 @@ def filter_python_files( directories, root, include=DEFAULT_INCLUDE_RE, - exclude=black_config.get("exclude", DEFAULT_EXCLUDE_RE), + exclude=black_config.get("exclude") or DEFAULT_EXCLUDE_RE, extend_exclude=black_config.get("extend_exclude"), force_exclude=black_config.get("force_exclude"), report=Report(),