summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Morton <seth.m.morton@gmail.com>2023-02-26 23:38:59 -0800
committerSeth Morton <seth.m.morton@gmail.com>2023-02-26 23:38:59 -0800
commit85e84a71c80555f05b4fbf9d82030f20f6fa5acd (patch)
tree7aa3f7ba9e40a7850fa1ff0ae625978970646c0c
parent4ae64aa2ee7f254c82ab4700147f7480eff807d7 (diff)
downloadnatsort-85e84a71c80555f05b4fbf9d82030f20f6fa5acd.tar.gz
Solve static analysis errors
-rw-r--r--natsort/compat/fastnumbers.py10
-rw-r--r--tests/test_string_component_transform_factory.py11
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"),
),