Skip to content

chore: fix missed future annotations #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 1 commit into from
Jan 31, 2025
Merged

chore: fix missed future annotations #1503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/zeroconf/_listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
USA
"""

from __future__ import annotations

import asyncio
import logging
import random
from functools import partial
from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union, cast
from typing import TYPE_CHECKING, Tuple, cast

from ._logger import QuietLogger, log
from ._protocol.incoming import DNSIncoming
Expand Down Expand Up @@ -68,23 +70,21 @@ class AsyncListener:
"zc",
)

def __init__(self, zc: "Zeroconf") -> None:
def __init__(self, zc: Zeroconf) -> None:
self.zc = zc
self._registry = zc.registry
self._record_manager = zc.record_manager
self._query_handler = zc.query_handler
self.data: Optional[bytes] = None
self.data: bytes | None = None
self.last_time: float = 0
self.last_message: Optional[DNSIncoming] = None
self.transport: Optional[_WrappedTransport] = None
self.sock_description: Optional[str] = None
self._deferred: Dict[str, List[DNSIncoming]] = {}
self._timers: Dict[str, asyncio.TimerHandle] = {}
self.last_message: DNSIncoming | None = None
self.transport: _WrappedTransport | None = None
self.sock_description: str | None = None
self._deferred: dict[str, list[DNSIncoming]] = {}
self._timers: dict[str, asyncio.TimerHandle] = {}
super().__init__()

def datagram_received(
self, data: _bytes, addrs: Union[Tuple[str, int], Tuple[str, int, int, int]]
) -> None:
def datagram_received(self, data: _bytes, addrs: tuple[str, int] | tuple[str, int, int, int]) -> None:
data_len = len(data)
debug = DEBUG_ENABLED()

Expand All @@ -108,7 +108,7 @@ def _process_datagram_at_time(
data_len: _int,
now: _float,
data: _bytes,
addrs: Union[Tuple[str, int], Tuple[str, int, int, int]],
addrs: tuple[str, int] | tuple[str, int, int, int],
) -> None:
if (
self.data == data
Expand All @@ -129,7 +129,7 @@ def _process_datagram_at_time(
return

if len(addrs) == 2:
v6_flow_scope: Union[Tuple[()], Tuple[int, int]] = ()
v6_flow_scope: tuple[()] | tuple[int, int] = ()
# https://github.com/python/mypy/issues/1178
addr, port = addrs # type: ignore
addr_port = addrs
Expand Down Expand Up @@ -189,7 +189,7 @@ def handle_query_or_defer(
addr: _str,
port: _int,
transport: _WrappedTransport,
v6_flow_scope: Union[Tuple[()], Tuple[int, int]],
v6_flow_scope: tuple[()] | tuple[int, int],
) -> None:
"""Deal with incoming query packets. Provides a response if
possible."""
Expand Down Expand Up @@ -224,11 +224,11 @@ def _cancel_any_timers_for_addr(self, addr: _str) -> None:

def _respond_query(
self,
msg: Optional[DNSIncoming],
msg: DNSIncoming | None,
addr: _str,
port: _int,
transport: _WrappedTransport,
v6_flow_scope: Union[Tuple[()], Tuple[int, int]],
v6_flow_scope: tuple[()] | tuple[int, int],
) -> None:
"""Respond to a query and reassemble any truncated deferred packets."""
self._cancel_any_timers_for_addr(addr)
Expand All @@ -252,5 +252,5 @@ def connection_made(self, transport: asyncio.BaseTransport) -> None:
self.transport = wrapped_transport
self.sock_description = f"{wrapped_transport.fileno} ({wrapped_transport.sock_name})"

def connection_lost(self, exc: Optional[Exception]) -> None:
def connection_lost(self, exc: Exception | None) -> None:
"""Handle connection lost."""