Accept suggestions from new toolchain

rec · rec · commit b1126c233bc6 · 2026-02-03T13:38:51.000+01:00
diff --git a/nmr/__main__.py b/nmr/__main__.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 import typer
 from typer import Argument, Option, Typer
@@ -51,7 +51,7 @@ def nmr_main(
         "-l",
         help="If true, display the input as a label to the output",
     ),
-    output_type: Optional[str] = Option(
+    output_type: str | None = Option(
         None,
         "--output-type",
         "-t",
@@ -65,10 +65,10 @@ def nmr_main(
         help="If True, don't catch exceptions, allow the program to terminate",
     ),
     random_count: int = Option(0, "--random-count", "-r", help="Print random names"),
-    word_count: Optional[int] = Option(
+    word_count: int | None = Option(
         None, "--word-count", "-c", help="How many words from the word file to use"
     ),
-    word_file: Optional[Path] = Option(
+    word_file: Path | None = Option(
         None,
         "--word-file",
         "-f",
diff --git a/nmr/_main.py b/nmr/_main.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import itertools
 import random
 import shlex
 import sys
 from functools import cached_property
 from pathlib import Path
-from typing import Any, Iterable, NoReturn, Sequence
+from typing import Any, NoReturn
+from collections.abc import Iterable
 
 import dtyper
 
@@ -83,7 +83,7 @@ def _type_class(self) -> type[TypeNamer[Any]] | None:
         return None
 
     def rnd(self) -> None:  # TODO re-enable
-        for i in range(self.random_count):
+        for _ in range(self.random_count):
             r = int(10 ** random.uniform(0, 50))
             print(f"{r}:", *self.nmr.encode_to_name(r))
 
diff --git a/nmr/category.py b/nmr/category.py
@@ -1,11 +1,6 @@
 from __future__ import annotations
 
-import dataclasses as dc
 from enum import IntEnum, auto
-from functools import lru_cache
-from typing import cast
-
-from typing_extensions import Self
 
 DEFAULT_RADIX = 8
 
diff --git a/nmr/nmr.py b/nmr/nmr.py
@@ -1,11 +1,6 @@
 from __future__ import annotations
 
-import bisect
-from collections import Counter
-from collections.abc import Iterator, Sequence
-from os import PathLike
-from pathlib import Path
-from typing import Any
+from collections.abc import Sequence
 
 from . import types
 from .words import Words
diff --git a/nmr/pack_numbers.py b/nmr/pack_numbers.py
@@ -1,7 +1,6 @@
-import bisect
 import dataclasses as dc
 import math
-from typing import Sequence
+from collections.abc import Sequence
 
 """
 A module for packing n numbers into a single number
diff --git a/nmr/radixes.py b/nmr/radixes.py
@@ -6,7 +6,7 @@ def encode(self, *digits: int) -> int:
         total, *digit = digits
         assert len(digit) == len(self.radixes)
 
-        for d, r in zip(digit, self.radixes):
+        for d, r in zip(digit, self.radixes, strict=False):
             total = r * total + d
         return total
 
diff --git a/nmr/type_namer.py b/nmr/type_namer.py
@@ -53,7 +53,7 @@ def _make(cls, s: int | str) -> DataType:
         return cast(DataType, data_type(s))
 
     def __init__(self) -> None:
-        assert False, "Cannot construct an instance of TypeNamer"
+        raise NotImplementedError
 
 
 def get_class(prefix: str) -> type[TypeNamer[Any]]:
diff --git a/nmr/types/__init__.py b/nmr/types/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import cast
 
 from ..category import Category, make_category
 from ..type_namer import TypeNamer
diff --git a/nmr/types/chess.py b/nmr/types/chess.py
@@ -35,7 +35,7 @@ def index_to_type(n: int) -> chess.Board:
         fields = (
             "/".join(index_to_row(r) for r in board),
             SIDES[side],
-            "".join(c for b, c in zip(castle, CASTLES) if b) or "-",
+            "".join(c for b, c in zip(castle, CASTLES, strict=False) if b) or "-",
             index_to_en_passant(ep),
             str(half_move),
             str(move),
diff --git a/nmr/types/fraction.py b/nmr/types/fraction.py
@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 import fractions
-import math
-from typing import Any
 
 from ..category import Math
 from ..pack_numbers import Packer
diff --git a/nmr/types/integer.py b/nmr/types/integer.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Any
-
 from ..category import Math
 from ..type_namer import TypeNamer
 
diff --git a/nmr/types/phone_number.py b/nmr/types/phone_number.py
@@ -11,10 +11,6 @@
 
 from __future__ import annotations
 
-import fractions
-import math
-from typing import Any
-
 from ..category import Commercial
 from ..type_namer import TypeNamer
 
diff --git a/nmr/types/time/constants.py b/nmr/types/time/constants.py
@@ -1,4 +1,3 @@
-from collections import Counter
 from enum import IntEnum, auto
 
 MICROSECOND_TO_YOCTOSECOND: int = 10 ** (24 - 6)
diff --git a/nmr/types/time/formats.py b/nmr/types/time/formats.py
@@ -2,17 +2,16 @@
 
 import itertools
 from datetime import datetime
-from functools import partial
-from typing import Callable, Iterable, Sequence, TYPE_CHECKING
+from typing import TYPE_CHECKING
+from collections.abc import Iterable, Sequence
 
 from .constants import Interval
 
-
 if TYPE_CHECKING:
     from .time import Time
 
 
-def from_string(s: str) -> "Time":
+def from_string(s: str) -> Time:
     from .time import Time
 
     def parse(p: str) -> datetime | None:
@@ -30,7 +29,7 @@ def parse(p: str) -> datetime | None:
     return times[0]
 
 
-def to_string(t: "Time") -> str:
+def to_string(t: Time) -> str:
     return t.time.strftime(PARSERS[t.interval][0])
 
 
diff --git a/nmr/types/time/time.py b/nmr/types/time/time.py
@@ -1,13 +1,11 @@
 from __future__ import annotations
-from ...type_namer import TypeNamer
 
 import dataclasses as dc
 from datetime import datetime
-from enum import IntEnum, auto
-from typing import cast
 
+from ...type_namer import TypeNamer
 from . import formats
-from .constants import MICROSECOND_TO_YOCTOSECOND, SCALES, Interval, INVERSE_SCALES
+from .constants import INVERSE_SCALES, MICROSECOND_TO_YOCTOSECOND, SCALES, Interval
 
 YEAR_ZERO = datetime.fromtimestamp(0).year
 INTERVAL_SCALE = len(Interval)
@@ -30,7 +28,7 @@ class Time(TypeNamer["Time"]):
     str_to_type = staticmethod(from_string)
 
     @staticmethod
-    def index_to_type(i: int) -> "Time":
+    def index_to_type(i: int) -> Time:
         count, interval = divmod(i, INTERVAL_SCALE)
         _base = INVERSE_SCALES[interval]
         raise NotImplementedError
@@ -89,10 +87,10 @@ def __str__(self) -> str:
         raise NotImplementedError  # todo
 
     @staticmethod
-    def str_to_type(cls, s: str) -> "Time": ...
+    def str_to_type(cls, s: str) -> Time: ...
 
     @staticmethod
-    def index_to_type(cls, i: int) -> "Time":
+    def index_to_type(cls, i: int) -> Time:
         count, interval = divmod(i, INTERVAL_SCALE)
         if interval == Interval.SECONDS:
             count = int(self.time.timestamp()) + (self.years * 365_2422) // 10000
diff --git a/nmr/words.py b/nmr/words.py
@@ -3,9 +3,9 @@
 import bisect
 from collections import Counter
 from collections.abc import Iterator, Sequence
-from os import PathLike
 from pathlib import Path
-from typing import Any, Iterable, cast
+from typing import cast
+from collections.abc import Iterable
 
 from . import count_words
 
@@ -63,7 +63,9 @@ def decode_from_name(self, name: Sequence[str]) -> int:
         name = list(self._maybe_lower(name))
         name = name[::-1]
         inverses = [self.inverse.get(w) for w in name]
-        if bad := ", ".join(n for n, i in zip(name, inverses) if i is None):
+        if bad := ", ".join(
+            n for n, i in zip(name, inverses, strict=False) if i is None
+        ):
             s = "s" if "," in bad else ""
             raise ValueError(f"Didn't recognize the following word{s}: {bad}")
         return self._from_digits(list(_redupe(cast(list[int], inverses)))[::-1])
diff --git a/test/test_chess.py b/test/test_chess.py
@@ -1,7 +1,7 @@
 import pytest
 from chess import Board
 
-from nmr import nmr, types
+from nmr import nmr
 from nmr.types import chess
 
 INDICES = 0, 1, 2, 17, 225289, 82394423423
diff --git a/test/test_main.py b/test/test_main.py
@@ -3,7 +3,6 @@
 
 import pytest
 
-from nmr.__main__ import nmr_main
 from nmr._main import Main
 
 
diff --git a/test/test_nmr.py b/test/test_nmr.py
@@ -1,6 +1,6 @@
 import pytest
 
-from nmr import Nmr, nmr
+from nmr import nmr
 from nmr.count_words import CountWords
 
 
diff --git a/test/test_time_format.py b/test/test_time_format.py
@@ -1,7 +1,5 @@
 import pytest
 
-from nmr.types.time import formats
-
 ROUND_TRIPS = ()
 
 
