Merge pull request #262 from kjd/ruff-update

Update to ruff 0.16 and adopt its expanded default rule set

Author: kjd

.github/requirements/lint.txt

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes .github/requirements/lint.in -o .github/requirements/lint.txt
+#    uv pip compile --generate-hashes --python-version 3.14 .github/requirements/lint.in -o .github/requirements/lint.txt
 ast-serialize==0.4.0 \
     --hash=sha256:074032142777e3e6091977dc3c5146a8ca58ae6825b7f64e9a0b604153ddabd8 \
     --hash=sha256:1026f565a7ab846337c630909089b3346a2fe417bf1552b1581ab01852137407 \
@@ -179,25 +179,25 @@ pathspec==1.1.1 \
     --hash=sha256:17db5ecd524104a120e173814c90367a96a98d07c45b2e10c2f3919fff91bf5a \
     --hash=sha256:a00ce642f577bf7f473932318056212bc4f8bfdf53128c78bbd5af0b9b20b189
     # via mypy
-ruff==0.15.13 \
-    --hash=sha256:1c26d2f66163deeb6e08d8b39fbbe983ce3c71cea06a6d7591cfd1421793c629 \
-    --hash=sha256:2471da9bd1068c8c064b5fd9c0c4b6dddffd6369cb1cd68b29993b1709ff1b21 \
-    --hash=sha256:2e2e39bff6c341f4b577a21b801326fab0b11847f48fcaa83f00a113c9b3cb55 \
-    --hash=sha256:4044f94208b3b05ba0fc4a4abd0558cf4d6459bd18325eead7fd8cc66f909b41 \
-    --hash=sha256:444b580fc72fd6887e650acd3e575e18cdc79dbcf42fb4030b491057921f61f8 \
-    --hash=sha256:6590d009e7cb7ebf36f83dbdd44a3fa48a0994ff6f1cdc1b08006abe58f98dc7 \
-    --hash=sha256:7064884d442b7d477b4e7473d12da7f08851d2b1982763c5d3f388a19468a1a4 \
-    --hash=sha256:768494eb08b9cee54e2fd27969966f74db5a57f6eaa7a90fcb3306af34dfc4bd \
-    --hash=sha256:7ef823f817fcd191dc934e984be9cf4094f808effa16f2542ad8e821ba02bbf2 \
-    --hash=sha256:8cb74dd33bb2f6613faf7fc03b660053b5ac4f80e706d5788c6335e2a8048d51 \
-    --hash=sha256:9dbd6f94b434f896308e4d57fb7bfde0d02b99f7a64b3bdab0fdfa6a864203a5 \
-    --hash=sha256:ae9c17e5eb4430c154e76abc25d79a318190f5a997f38fb6b114416c5319ffc9 \
-    --hash=sha256:bf3259f3be4d181bda591da5db2571aed6853c6a048157756448020bc6c5cd22 \
-    --hash=sha256:cc411dfebe5eebe55ce041c6ae080eb7668955e866daa2fbb16692a784f1c4ca \
-    --hash=sha256:e8d9a8e08013542e94d3220bc5b62cc3e5ef87c5f74bff367d3fac14fab013e6 \
-    --hash=sha256:f345a13937bd7f09f6f5d19fa0721b0c103e00e7f62bc67089a8e5e037719e0b \
-    --hash=sha256:f9d89f17f7ba7fb2ed42921f0df75da797a9a5d71bc39049e2c687cf2baf44b7 \
-    --hash=sha256:fb75f9a3a7e42ffe117d734494e6c5e5cb3565d66e12612cb63d0e572a41a5b6
+ruff==0.16.3 \
+    --hash=sha256:09571e6d1288ed9be475207a3ac04ada404f1cd898104be0f6ab8d7df438575b \
+    --hash=sha256:0c5710e247a58a4521e66e124ba9a74655b414f61ba3a2e9e3811e11098f48f7 \
+    --hash=sha256:294b95c4ae0cda9388525c2047778aa758d6b8d4bb876fd4e9eaa3ebc92343eb \
+    --hash=sha256:2c18c5a101eb540010638cc1ff3c84944d3adb3df62b8d98ca8f22ba484d3413 \
+    --hash=sha256:388cdf2166642bd9b13d52b5932d3170f34f8abed7e8d9a855f1d84b83645a0a \
+    --hash=sha256:3d0c7c40c87c2a820509c31ba007968da6e1306468c067b2d82fbfdbcd0e8474 \
+    --hash=sha256:8457c44f15033c85ddbb77b15d451df9e24e4bd03b628396dd3610cedc3b8f82 \
+    --hash=sha256:9e0b1da805eb043654645d74d5de1e5ce2edc686e40790d2b86f56d71cc06a84 \
+    --hash=sha256:9f738c0fdfa8eed0b2ce7fb27ee7258208a92a68d7949e62aa15164bc7b389da \
+    --hash=sha256:a2d85c02f9b8e165d85e6779184d38c4132de12603dab59c51c28e22584f9e4d \
+    --hash=sha256:a37bdea0bbe21780f590bf437d6412c8c4e1b6cd010f91a65c2c40c5e5f5f870 \
+    --hash=sha256:b8ca152da82c1acc1fa8d5874b15951935f0eef46f10e6954c83859011b6178a \
+    --hash=sha256:c5536e3acfbf9563085aa2be7b13c629c3077e902afc5b941ac44024dbb9f506 \
+    --hash=sha256:e2ed719e14aa64d895c2ee922594a90a43c861a93f0575a95ff8c47cdbd13eb9 \
+    --hash=sha256:e76d33a347661a84b5be6d043d0347fdc745dfdcf825a8f4fed64b5e26eebdf2 \
+    --hash=sha256:e80a7d69ca2a6d1c4d352ec91458cdca6e56c83cdbcabd93e4abe1e53591d948 \
+    --hash=sha256:fb785f0be25abe69d320415cd4f833b59e17ba7613d9ba6a958023b6bceb0a50 \
+    --hash=sha256:fe155130631a2471fd2e14a7a664a4dfbd7194b8229c3d7b2a40b21178639081
     # via -r .github/requirements/lint.in
 ty==0.0.37 \
     --hash=sha256:119332095c5974fe1dabfe4fd00c6759eeec5b99f7d7a80b2833feee5a58abdb \

idna/cli.py

@@ -3,16 +3,20 @@
 Invoked via ``python -m idna``. See :func:`main` for the entry point.
 """
 
+from __future__ import annotations
+
 import argparse
 import sys
-from collections.abc import Iterable
 from itertools import chain
-from typing import IO, Optional
+from typing import IO, TYPE_CHECKING
 
 from . import IDNAError, decode, encode
 from .core import _alabel_prefix, _unicode_dots_re
 from .package_data import __version__
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 def _looks_like_alabel(s: str) -> bool:
     """Return True if any label in ``s`` carries the ``xn--`` ACE prefix."""
@@ -91,7 +95,7 @@ def _convert_one(domain: str, mode: str, uts46: bool) -> bool:
     return True
 
 
-def main(argv: Optional[list[str]] = None) -> int:
+def main(argv: list[str] | None = None) -> int:
     """Entry point for ``python -m idna``.
 
     When more than one domain is supplied (via positional arguments or

idna/codec.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import codecs
-from typing import Any, Optional
+from typing import Any
 
 from .core import IDNAError, _unicode_dots_re, alabel, decode, encode, ulabel
 
@@ -132,7 +134,7 @@ class StreamReader(Codec, codecs.StreamReader):
     pass
 
 
-def search_function(name: str) -> Optional[codecs.CodecInfo]:
+def search_function(name: str) -> codecs.CodecInfo | None:
     """Codec search function registered with :mod:`codecs`.
 
     Returns a :class:`codecs.CodecInfo` for the ``"idna2008"`` codec name

idna/compat.py

@@ -1,4 +1,6 @@
-from typing import Any, Union
+from __future__ import annotations
+
+from typing import Any
 
 from .core import decode, encode
 
@@ -16,7 +18,7 @@ def ToASCII(label: str) -> bytes:
     return encode(label)
 
 
-def ToUnicode(label: Union[bytes, bytearray]) -> str:
+def ToUnicode(label: bytes | bytearray) -> str:
     """Compatibility shim for :rfc:`3490` ``ToUnicode``.
 
     Delegates to :func:`idna.decode` (IDNA 2008). Provided to ease porting

idna/core.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import bisect
 import re
 import unicodedata
 import warnings
-from typing import Optional, Union
 
 from . import idnadata
 from .intranges import intranges_contain
@@ -25,7 +26,7 @@
 _bidi_joiner_r_or_d = frozenset({"R", "D"})
 
 
-def _joining_type(cp: int) -> Optional[str]:
+def _joining_type(cp: int) -> str | None:
     for jt, ranges in idnadata.joining_types.items():
         if intranges_contain(cp, ranges):
             return jt
@@ -67,7 +68,7 @@ def _unot(s: int) -> str:
     return f"U+{s:04X}"
 
 
-def valid_label_length(label: Union[bytes, str]) -> bool:
+def valid_label_length(label: bytes | str) -> bool:
     """Check that a label does not exceed the maximum permitted length.
 
     Per :rfc:`1035` (and :rfc:`5891` §4.2.4) a DNS label must not exceed
@@ -82,7 +83,7 @@ def valid_label_length(label: Union[bytes, str]) -> bool:
     return len(label) <= 63
 
 
-def valid_string_length(domain: Union[bytes, str], trailing_dot: bool) -> bool:
+def valid_string_length(domain: bytes | str, trailing_dot: bool) -> bool:
     """Check that a full domain name does not exceed the maximum length.
 
     Per :rfc:`1035`, a domain name is limited to 253 octets when no trailing
@@ -136,7 +137,7 @@ def check_bidi(label: str, check_ltr: bool = False) -> bool:
         raise IDNABidiError(f"First codepoint in label {label!r} must be directionality L, R or AL")
 
     valid_ending = False
-    number_type: Optional[str] = None
+    number_type: str | None = None
     for idx, cp in enumerate(label, 1):
         direction = unicodedata.bidirectional(cp)
 
@@ -319,7 +320,7 @@ def valid_contexto(label: str, pos: int, exception: bool = False) -> bool:
     return False
 
 
-def check_label(label: Union[str, bytes, bytearray]) -> None:
+def check_label(label: str | bytes | bytearray) -> None:
     """Run the full set of IDNA 2008 validity checks on a single label.
 
     Applies, in order: NFC normalisation (:func:`check_nfc`), hyphen
@@ -409,7 +410,7 @@ def alabel(label: str) -> bytes:
     return label_bytes
 
 
-def ulabel(label: Union[str, bytes, bytearray]) -> str:
+def ulabel(label: str | bytes | bytearray) -> str:
     """Convert a single A-label into its U-label form.
 
     Performs the inverse of :func:`alabel`: an ``xn--``-prefixed label is
@@ -482,7 +483,7 @@ def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False
         code_point = ord(char)
         i = code_point if code_point < 256 else bisect.bisect_right(uts46_starts, code_point) - 1
         status = chr(uts46_statuses[i])
-        replacement: Optional[str] = uts46_replacements[i]
+        replacement: str | None = uts46_replacements[i]
 
         # UTS #46 §4: V is always valid, D is deviation (kept unless transitional),
         # 3 is disallowed-STD3 (kept unmapped if std3_rules is off and no mapping).
@@ -509,7 +510,7 @@ def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False
 
 
 def encode(
-    s: Union[str, bytes, bytearray],
+    s: str | bytes | bytearray,
     strict: bool = False,
     uts46: bool = False,
     std3_rules: bool = False,
@@ -581,7 +582,7 @@ def encode(
 
 
 def decode(
-    s: Union[str, bytes, bytearray],
+    s: str | bytes | bytearray,
     strict: bool = False,
     uts46: bool = False,
     std3_rules: bool = False,

idna/uts46data.py

@@ -1,14 +1,15 @@
 # This file is automatically generated by tools/idna-data
 
+from __future__ import annotations
+
 from array import array
-from typing import Optional
 
 """IDNA Mapping Table from UTS46."""
 
 
 __version__ = "17.0.0"
 
-uts46_starts: "array[int]" = array(
+uts46_starts: array[int] = array(
     "I",
     (
         0x0,
@@ -8520,7 +8521,7 @@
     b"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMXVXVXIX"
 )
 
-uts46_replacements: tuple[Optional[str], ...] = (
+uts46_replacements: tuple[str | None, ...] = (
     None,
     None,
     None,

pyproject.toml

@@ -48,7 +48,7 @@ include = ["tests", "tools", "HISTORY.md"]
 
 [project.optional-dependencies]
 all = [
-    "ruff >= 0.6.2",
+    "ruff >= 0.16.0",
     "mypy >= 1.11.2",
     "pytest >= 8.3.2",
 ]
@@ -57,6 +57,11 @@ all = [
 line-length = 127
 [tool.ruff.lint]
 extend-select = [
+    # pycodestyle import/statement/runtime errors; these were part of ruff's
+    # default rule set before 0.16 and are kept explicitly here.
+    "E4",
+    "E7",
+    "E9",
     "I",            # isort
     "B",            # flake8-bugbear
     "SIM",          # flake8-simplify
@@ -65,6 +70,10 @@ extend-select = [
     "PIE",          # flake8-pie
     "RET",          # flake8-return
     "RUF",          # ruff-specific
+    "PTH",          # flake8-use-pathlib
+    "TC",           # flake8-type-checking
+    "FURB",         # refurb
+    "C4",           # flake8-comprehensions
 ]
 ignore = [
     # An IDN library legitimately handles confusable / ambiguous Unicode;

tests/test_idna.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import unittest
 import warnings
 

tests/test_idna_cli.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import io
 import subprocess
 import sys

tests/test_idna_codec.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import codecs
 import io
 import unittest