From 3197cfaaa717e174d7f1dcfb95ce623e615215a0 Mon Sep 17 00:00:00 2001 From: Lev Blit Date: Fri, 7 Nov 2025 17:45:43 +0200 Subject: [PATCH 1/2] [netaddr]: add missing type to parameters --- stubs/netaddr/netaddr/core.pyi | 2 +- stubs/netaddr/netaddr/ip/__init__.pyi | 5 ++++- stubs/netaddr/netaddr/ip/iana.pyi | 16 ++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/stubs/netaddr/netaddr/core.pyi b/stubs/netaddr/netaddr/core.pyi index 03460aa3eb71..54adab8f11f4 100644 --- a/stubs/netaddr/netaddr/core.pyi +++ b/stubs/netaddr/netaddr/core.pyi @@ -13,7 +13,7 @@ class AddrConversionError(Exception): ... class NotRegisteredError(Exception): ... class Subscriber: - def update(self, data) -> None: ... + def update(self, data: object) -> None: ... class PrettyPrinter(Subscriber): fh: SupportsWrite[str] diff --git a/stubs/netaddr/netaddr/ip/__init__.pyi b/stubs/netaddr/netaddr/ip/__init__.pyi index b857e10436ad..9aa6a680bd43 100644 --- a/stubs/netaddr/netaddr/ip/__init__.pyi +++ b/stubs/netaddr/netaddr/ip/__init__.pyi @@ -1,6 +1,7 @@ from _typeshed import ConvertibleToInt, Unused from abc import abstractmethod from collections.abc import Iterable, Iterator +from types import ModuleType from typing import Literal, SupportsIndex, SupportsInt, overload from typing_extensions import Self, TypeAlias @@ -95,7 +96,9 @@ class IPListMixin: def __contains__(self, other: BaseIP | _IPAddressAddr) -> bool: ... def __bool__(self) -> Literal[True]: ... -def parse_ip_network(module, addr: tuple[int, int] | str, flags: int = 0, *, expand_partial: bool = False) -> tuple[int, int]: ... +def parse_ip_network( + module: ModuleType, addr: tuple[int, int] | str, flags: int = 0, *, expand_partial: bool = False +) -> tuple[int, int]: ... class IPNetwork(BaseIP, IPListMixin): __slots__ = ("_prefixlen",) diff --git a/stubs/netaddr/netaddr/ip/iana.pyi b/stubs/netaddr/netaddr/ip/iana.pyi index ac386eb78195..a689f90cb52c 100644 --- a/stubs/netaddr/netaddr/ip/iana.pyi +++ b/stubs/netaddr/netaddr/ip/iana.pyi @@ -1,9 +1,9 @@ -from _typeshed import Incomplete, SupportsWrite +from _typeshed import SupportsWrite from collections.abc import Callable, Mapping, MutableMapping from typing import Any from typing_extensions import TypeAlias -from xml.sax import handler -from xml.sax.xmlreader import AttributesImpl, XMLReader +from xml.sax import _Source, handler +from xml.sax.xmlreader import AttributesImpl, InputSource, XMLReader from netaddr.core import Publisher, Subscriber from netaddr.ip import IPAddress, IPNetwork, IPRange @@ -20,8 +20,8 @@ class SaxRecordParser(handler.ContentHandler): class XMLRecordParser(Publisher): xmlparser: XMLReader - fh: Incomplete - def __init__(self, fh, **kwargs: object) -> None: ... + fh: InputSource | _Source + def __init__(self, fh: InputSource | _Source, **kwargs: object) -> None: ... def process_record(self, rec: Mapping[str, object]) -> dict[str, str] | None: ... def consume_record(self, rec: object) -> None: ... def parse(self) -> None: ... @@ -41,11 +41,11 @@ class MulticastParser(XMLRecordParser): def normalise_addr(self, addr: str) -> str: ... class DictUpdater(Subscriber): - dct: MutableMapping[_IanaInfoKey, Incomplete] + dct: MutableMapping[_IanaInfoKey, dict[str, Any]] topic: str unique_key: str - def __init__(self, dct: MutableMapping[_IanaInfoKey, Incomplete], topic: str, unique_key: str) -> None: ... - def update(self, data) -> None: ... + def __init__(self, dct: MutableMapping[_IanaInfoKey, dict[str, Any]], topic: str, unique_key: str) -> None: ... + def update(self, data: dict[str, Any]) -> None: ... def load_info() -> None: ... def pprint_info(fh: SupportsWrite[str] | None = None) -> None: ... From 7eb19f83cbe9f95c60cbe327f57bd5943e1b6962 Mon Sep 17 00:00:00 2001 From: Lev Blit Date: Fri, 7 Nov 2025 17:50:15 +0200 Subject: [PATCH 2/2] remove object --- stubs/netaddr/netaddr/core.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/netaddr/netaddr/core.pyi b/stubs/netaddr/netaddr/core.pyi index 54adab8f11f4..03460aa3eb71 100644 --- a/stubs/netaddr/netaddr/core.pyi +++ b/stubs/netaddr/netaddr/core.pyi @@ -13,7 +13,7 @@ class AddrConversionError(Exception): ... class NotRegisteredError(Exception): ... class Subscriber: - def update(self, data: object) -> None: ... + def update(self, data) -> None: ... class PrettyPrinter(Subscriber): fh: SupportsWrite[str]