From 85e84a71c80555f05b4fbf9d82030f20f6fa5acd Mon Sep 17 00:00:00 2001 From: Seth Morton Date: Sun, 26 Feb 2023 23:38:59 -0800 Subject: Solve static analysis errors --- natsort/compat/fastnumbers.py | 10 +++++----- tests/test_string_component_transform_factory.py | 11 ++++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/natsort/compat/fastnumbers.py b/natsort/compat/fastnumbers.py index b4ae5cc..f37ee84 100644 --- a/natsort/compat/fastnumbers.py +++ b/natsort/compat/fastnumbers.py @@ -4,7 +4,7 @@ Interface for natsort to access fastnumbers functions without having to worry if it is actually installed. """ import re -from typing import Callable, Iterable, Iterator, Literal, Tuple, Union +from typing import Callable, Iterable, Iterator, Tuple, Union StrOrFloat = Union[str, float] StrOrInt = Union[str, int] @@ -53,9 +53,9 @@ except ImportError: # then there is nothing to do. if "try_float" not in globals(): - def try_float( # noqa: F811, type: ignore[no-redef] + def try_float( # type: ignore[no-redef] # noqa: F811 x: Iterable[str], - map: Literal[True], + map: bool, nan: float = float("inf"), on_fail: Callable[[str], str] = lambda x: x, ) -> Iterator[StrOrFloat]: @@ -65,9 +65,9 @@ if "try_float" not in globals(): if "try_int" not in globals(): - def try_int( # noqa: F811, type: ignore[no-redef] + def try_int( # type: ignore[no-redef] # noqa: F811 x: Iterable[str], - map: Literal[True], + map: bool, on_fail: Callable[[str], str] = lambda x: x, ) -> Iterator[StrOrInt]: assert map is True diff --git a/tests/test_string_component_transform_factory.py b/tests/test_string_component_transform_factory.py index 78d37bf..4c8ed87 100644 --- a/tests/test_string_component_transform_factory.py +++ b/tests/test_string_component_transform_factory.py @@ -43,16 +43,21 @@ def no_null(x: str) -> bool: (ns.LOCALE, partial(try_int, map=True, on_fail=lambda x: get_strxfrm()(x))), ( ns.GROUPLETTERS | ns.LOCALE, - partial(try_int, map=True, on_fail=lambda x: get_strxfrm()(groupletters(x))), + partial( + try_int, map=True, on_fail=lambda x: get_strxfrm()(groupletters(x)) + ), ), ( NS_DUMB | ns.LOCALE, - partial(try_int, map=True, on_fail=lambda x: get_strxfrm()(groupletters(x))), + partial( + try_int, map=True, on_fail=lambda x: get_strxfrm()(groupletters(x)) + ), ), ( ns.GROUPLETTERS | ns.LOCALE | ns.FLOAT | ns.NANLAST, partial( - try_float, map=True, + try_float, + map=True, on_fail=lambda x: get_strxfrm()(groupletters(x)), nan=float("+inf"), ), -- cgit v1.2.1