zeroconf 0.152.0__tar.gz → 0.153.0__tar.gz

{zeroconf-0.152.0 → zeroconf-0.153.0}/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 <!-- version list -->
 
+## v0.153.0 (2026-10-31)
+
+### Features
+
+- Drop Python 3.10 support ([#1935](https://github.com/python-zeroconf/python-zeroconf/pull/1935),
+  [`7fd81ac`](https://github.com/python-zeroconf/python-zeroconf/commit/7fd81ac5d3ce1846671e9b8e1fab0b425b112f67))
+
+
+## v0.152.1 (2026-10-31)
+
+### Bug Fixes
+
+- Don't suppress a scoped copy of a packet as a duplicate of an unscoped one
+  ([#1926](https://github.com/python-zeroconf/python-zeroconf/pull/1926),
+  [`737c667`](https://github.com/python-zeroconf/python-zeroconf/commit/737c6675a66428624b0c2382d460cd600f11838e))
+
+
 ## v0.152.0 (2026-10-31)
 
 ### Features

{zeroconf-0.152.0 → zeroconf-0.153.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: zeroconf
-Version: 0.152.0
+Version: 0.153.0
 Summary: A pure python implementation of multicast DNS service discovery
 License-Expression: LGPL-2.1-or-later
 License-File: COPYING
 Author: The python-zeroconf authors
 Maintainer: J. Nick Koston
 Maintainer-email: nick@koston.org
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
@@ -15,7 +15,6 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -74,8 +73,8 @@ Compared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:
 Python compatibility
 --------------------
 
-* CPython 3.10+
-* PyPy 3.10+
+* CPython 3.11+
+* PyPy 3.11+
 
 Versioning
 ----------

{zeroconf-0.152.0 → zeroconf-0.153.0}/README.rst

@@ -41,8 +41,8 @@ Compared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:
 Python compatibility
 --------------------
 
-* CPython 3.10+
-* PyPy 3.10+
+* CPython 3.11+
+* PyPy 3.11+
 
 Versioning
 ----------

{zeroconf-0.152.0 → zeroconf-0.153.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "zeroconf"
-version = "0.152.0"
+version = "0.153.0"
 license = "LGPL-2.1-or-later"
 description = "A pure python implementation of multicast DNS service discovery"
 readme = "README.rst"
@@ -14,7 +14,7 @@ authors = [
 maintainers = [
     { name = "J. Nick Koston", email = "nick@koston.org" },
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 [project.urls]
 "Repository" = "https://github.com/python-zeroconf/python-zeroconf"
@@ -80,13 +80,13 @@ match = "(?!(master|release-0.x)$)"
 prerelease = true
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.11"
 ifaddr = ">=0.1.7"
 
 [tool.poetry.group.dev.dependencies]
-pytest = ">=9.1.1,<10.0"
+pytest = ">=9.2.0,<10.0"
 pytest-cov = ">=4,<8"
-pytest-asyncio = ">=1.4.0,<1.5.0"
+pytest-asyncio = ">=1.4.1,<1.5.0"
 cython = "^3.3.0"
 setuptools = ">=84.2.1,<85.0.0"
 pytest-timeout = "^2.1.0"
@@ -99,7 +99,7 @@ sphinx = "^7.4.7 || ^8.1.3"
 sphinx-rtd-theme = "^3.1.0"
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
 line-length = 110
 
 [tool.ruff.lint]
@@ -117,10 +117,10 @@ ignore = [
     "PGH004",  # too many to fix
     "PGH003", # too many to fix
     "SIM110", # this is slower
-    "PYI034", # enable when we drop Py3.10
     "PYI032", # breaks Cython
     "PYI041",  # breaks Cython
     "PERF401", # Cython: closures inside cpdef functions not yet supported
+    "ASYNC109", # timeout params are public API
 ]
 select = [
     "ASYNC", # async rules

{zeroconf-0.152.0 → zeroconf-0.153.0}/setup.py

@@ -19,9 +19,9 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'zeroconf',
-    'version': '0.152.0',
+    'version': '0.153.0',
     'description': 'A pure python implementation of multicast DNS service discovery',
-    'long_description': 'python-zeroconf\n===============\n\n.. image:: https://github.com/python-zeroconf/python-zeroconf/workflows/CI/badge.svg\n   :target: https://github.com/python-zeroconf/python-zeroconf?query=workflow%3ACI+branch%3Amaster\n\n.. image:: https://img.shields.io/pypi/v/zeroconf.svg\n    :target: https://pypi.python.org/pypi/zeroconf\n\n.. image:: https://codecov.io/gh/python-zeroconf/python-zeroconf/branch/master/graph/badge.svg\n   :target: https://codecov.io/gh/python-zeroconf/python-zeroconf\n\n.. image:: https://img.shields.io/endpoint?url=https://codspeed.io/badge.json\n   :target: https://codspeed.io/python-zeroconf/python-zeroconf\n   :alt: Codspeed.io status for python-zeroconf\n\n.. image:: https://readthedocs.org/projects/python-zeroconf/badge/?version=latest\n    :target: https://python-zeroconf.readthedocs.io/en/latest/?badge=latest\n    :alt: Documentation Status\n\n`Documentation <https://python-zeroconf.readthedocs.io/en/latest/>`_.\n\nThis project is a fork of pyzeroconf, originally by Paul Scott-Murphy\n(https://github.com/paulsm/pyzeroconf), modified by William McBrine\n(https://github.com/wmcbrine/pyzeroconf).\n\nCompatible with:\n\n* Bonjour\n* Avahi\n\nCompared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:\n\n* isn\'t tied to Bonjour or Avahi\n* doesn\'t use D-Bus\n* doesn\'t force you to use particular event loop or Twisted (asyncio is used under the hood but not required)\n* is pip-installable\n* has PyPI distribution\n* has an optional cython extension for performance (pure python is supported as well)\n\nPython compatibility\n--------------------\n\n* CPython 3.10+\n* PyPy 3.10+\n\nVersioning\n----------\n\nThis project uses semantic versioning.\n\nStatus\n------\n\nThis project is actively maintained.\n\nTraffic Reduction\n-----------------\n\nBefore version 0.32, most traffic reduction techniques described in https://datatracker.ietf.org/doc/html/rfc6762#section-7\nwhere not implemented which could lead to excessive network traffic.  It is highly recommended that version 0.32 or later\nis used if this is a concern.\n\nIPv6 support\n------------\n\nIPv6 support is relatively new and currently limited, specifically:\n\n* `InterfaceChoice.All` is an alias for `InterfaceChoice.Default` on non-POSIX\n  systems.\n* Dual-stack IPv6 sockets are used, which may not be supported everywhere (some\n  BSD variants do not have them).\n* Listening on localhost (`::1`) does not work. Help with understanding why is\n  appreciated.\n\nHow to get python-zeroconf?\n===========================\n\n* PyPI page https://pypi.org/project/zeroconf/\n* GitHub project https://github.com/python-zeroconf/python-zeroconf\n\nThe easiest way to install python-zeroconf is using pip::\n\n    pip install zeroconf\n\n\n\nHow do I use it?\n================\n\nHere\'s how to discover services:\n\n.. code-block:: python\n\n    from zeroconf import ServiceBrowser, ServiceListener, Zeroconf\n\n\n    class EventLogger(ServiceListener):\n        def add_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            info = zc.get_service_info(type_, name)\n            print(f"discovered {name}: {info}")\n\n        def remove_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            print(f"lost {name}")\n\n        def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            print(f"refreshed {name}")\n\n\n    with Zeroconf() as zc:\n        ServiceBrowser(zc, "_http._tcp.local.", EventLogger())\n        input("browsing, press enter to stop\\n")\n\n.. note::\n\n    Discovery and service registration use *all* available network interfaces by default.\n    If you want to customize that you need to specify ``interfaces`` argument when\n    constructing ``Zeroconf`` object (see the code for details).\n\nTo see which service types are present on the network, try:\n\n.. code-block:: python\n\n    from zeroconf import ZeroconfServiceTypes\n    print(\'\\n\'.join(ZeroconfServiceTypes.find()))\n\nSee examples directory for more.\n\nChangelog\n=========\n\n`Changelog <CHANGELOG.md>`_\n\nLicense\n=======\n\nGNU Lesser General Public License v2.1 or later (LGPL-2.1-or-later).\n\nThe full text of LGPL 2.1 is included in the `COPYING <COPYING>`_ file.\nYou may, at your option, use this library under the terms of any later\nversion of the LGPL published by the Free Software Foundation. The\ncanonical SPDX identifier for this project is ``LGPL-2.1-or-later``, as\ndeclared in ``pyproject.toml``.\n',
+    'long_description': 'python-zeroconf\n===============\n\n.. image:: https://github.com/python-zeroconf/python-zeroconf/workflows/CI/badge.svg\n   :target: https://github.com/python-zeroconf/python-zeroconf?query=workflow%3ACI+branch%3Amaster\n\n.. image:: https://img.shields.io/pypi/v/zeroconf.svg\n    :target: https://pypi.python.org/pypi/zeroconf\n\n.. image:: https://codecov.io/gh/python-zeroconf/python-zeroconf/branch/master/graph/badge.svg\n   :target: https://codecov.io/gh/python-zeroconf/python-zeroconf\n\n.. image:: https://img.shields.io/endpoint?url=https://codspeed.io/badge.json\n   :target: https://codspeed.io/python-zeroconf/python-zeroconf\n   :alt: Codspeed.io status for python-zeroconf\n\n.. image:: https://readthedocs.org/projects/python-zeroconf/badge/?version=latest\n    :target: https://python-zeroconf.readthedocs.io/en/latest/?badge=latest\n    :alt: Documentation Status\n\n`Documentation <https://python-zeroconf.readthedocs.io/en/latest/>`_.\n\nThis project is a fork of pyzeroconf, originally by Paul Scott-Murphy\n(https://github.com/paulsm/pyzeroconf), modified by William McBrine\n(https://github.com/wmcbrine/pyzeroconf).\n\nCompatible with:\n\n* Bonjour\n* Avahi\n\nCompared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:\n\n* isn\'t tied to Bonjour or Avahi\n* doesn\'t use D-Bus\n* doesn\'t force you to use particular event loop or Twisted (asyncio is used under the hood but not required)\n* is pip-installable\n* has PyPI distribution\n* has an optional cython extension for performance (pure python is supported as well)\n\nPython compatibility\n--------------------\n\n* CPython 3.11+\n* PyPy 3.11+\n\nVersioning\n----------\n\nThis project uses semantic versioning.\n\nStatus\n------\n\nThis project is actively maintained.\n\nTraffic Reduction\n-----------------\n\nBefore version 0.32, most traffic reduction techniques described in https://datatracker.ietf.org/doc/html/rfc6762#section-7\nwhere not implemented which could lead to excessive network traffic.  It is highly recommended that version 0.32 or later\nis used if this is a concern.\n\nIPv6 support\n------------\n\nIPv6 support is relatively new and currently limited, specifically:\n\n* `InterfaceChoice.All` is an alias for `InterfaceChoice.Default` on non-POSIX\n  systems.\n* Dual-stack IPv6 sockets are used, which may not be supported everywhere (some\n  BSD variants do not have them).\n* Listening on localhost (`::1`) does not work. Help with understanding why is\n  appreciated.\n\nHow to get python-zeroconf?\n===========================\n\n* PyPI page https://pypi.org/project/zeroconf/\n* GitHub project https://github.com/python-zeroconf/python-zeroconf\n\nThe easiest way to install python-zeroconf is using pip::\n\n    pip install zeroconf\n\n\n\nHow do I use it?\n================\n\nHere\'s how to discover services:\n\n.. code-block:: python\n\n    from zeroconf import ServiceBrowser, ServiceListener, Zeroconf\n\n\n    class EventLogger(ServiceListener):\n        def add_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            info = zc.get_service_info(type_, name)\n            print(f"discovered {name}: {info}")\n\n        def remove_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            print(f"lost {name}")\n\n        def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            print(f"refreshed {name}")\n\n\n    with Zeroconf() as zc:\n        ServiceBrowser(zc, "_http._tcp.local.", EventLogger())\n        input("browsing, press enter to stop\\n")\n\n.. note::\n\n    Discovery and service registration use *all* available network interfaces by default.\n    If you want to customize that you need to specify ``interfaces`` argument when\n    constructing ``Zeroconf`` object (see the code for details).\n\nTo see which service types are present on the network, try:\n\n.. code-block:: python\n\n    from zeroconf import ZeroconfServiceTypes\n    print(\'\\n\'.join(ZeroconfServiceTypes.find()))\n\nSee examples directory for more.\n\nChangelog\n=========\n\n`Changelog <CHANGELOG.md>`_\n\nLicense\n=======\n\nGNU Lesser General Public License v2.1 or later (LGPL-2.1-or-later).\n\nThe full text of LGPL 2.1 is included in the `COPYING <COPYING>`_ file.\nYou may, at your option, use this library under the terms of any later\nversion of the LGPL published by the Free Software Foundation. The\ncanonical SPDX identifier for this project is ``LGPL-2.1-or-later``, as\ndeclared in ``pyproject.toml``.\n',
     'author': 'The python-zeroconf authors',
     'author_email': 'None',
     'maintainer': 'J. Nick Koston',
@@ -31,7 +31,7 @@ setup_kwargs = {
     'packages': packages,
     'package_data': package_data,
     'install_requires': install_requires,
-    'python_requires': '>=3.10',
+    'python_requires': '>=3.11',
 }
 from build_ext import *
 build(setup_kwargs)

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/__init__.py

@@ -73,7 +73,7 @@ from ._utils.time import (  # noqa # import needed for backwards compat
 
 __author__ = "The python-zeroconf authors"  # full history in COPYING and git
 __maintainer__ = "J. Nick Koston <nick@koston.org>"
-__version__ = "0.152.0"
+__version__ = "0.153.0"
 __license__ = "LGPL"
 
 

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_cache.pxd

@@ -38,6 +38,9 @@ cdef class DNSCache:
 
     cpdef void async_remove_records(self, object entries)
 
+    @cython.locals(store=cython.dict)
+    cpdef DNSAddress async_get_address(self, DNSAddress entry)
+
     @cython.locals(store=cython.dict)
     cpdef DNSRecord async_get_unique(self, DNSRecord entry)
 

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_cache.py

@@ -131,6 +131,21 @@ class DNSCache:
         self.async_remove_records(expired)
         return expired
 
+    def async_get_address(self, entry: DNSAddress) -> DNSAddress | None:
+        """Look up the cached copy of an address record under any scope, or None."""
+        store = self.cache.get(entry.key)
+        if store is None:
+            return None
+        for record in store.values():
+            if (
+                isinstance(record, DNSAddress)
+                and record.address == entry.address
+                and record.type == entry.type
+                and record.class_ == entry.class_
+            ):
+                return record
+        return None
+
     def async_get_unique(self, entry: _UniqueRecordsType) -> DNSRecord | None:
         """Look up the cached copy of a unique record, or None.
 

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_core.py

@@ -14,6 +14,7 @@ import sys
 import threading
 from collections.abc import Awaitable
 from types import TracebackType
+from typing import Self
 
 from ._cache import DNSCache
 from ._dns import DNSQuestion, DNSQuestionType
@@ -212,7 +213,7 @@ class Zeroconf(QuietLogger):
 
         self.start()
 
-    def __enter__(self) -> Zeroconf:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(  # pylint: disable=useless-return

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_dns.pxd

@@ -78,6 +78,8 @@ cdef class DNSAddress(DNSRecord):
 
     cdef bint _eq(self, DNSAddress other)
 
+    cdef void _set_scope_id(self, object scope_id)
+
     cpdef write(self, DNSOutgoing out)
 
 

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_dns.py

@@ -310,6 +310,11 @@ class DNSAddress(DNSRecord):
         self.scope_id = scope_id
         self._hash = hash((self.key, type_, self.class_, address, scope_id))
 
+    def _set_scope_id(self, scope_id: _int | None) -> None:
+        """Replace the scope of a record that is not cached yet."""
+        self.scope_id = scope_id
+        self._hash = hash((self.key, self.type, self.class_, self.address, scope_id))
+
 
 class DNSHinfo(DNSRecord):
     """HINFO record carrying the host's cpu and os strings."""

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_handlers/record_manager.pxd

@@ -2,7 +2,7 @@
 import cython
 
 from .._cache cimport DNSCache
-from .._dns cimport DNSQuestion, DNSRecord
+from .._dns cimport DNSAddress, DNSQuestion, DNSRecord
 from .._protocol.incoming cimport DNSIncoming
 from .._updates cimport RecordUpdateListener
 from .._utils.time cimport current_time_millis
@@ -10,6 +10,7 @@ from .._record_update cimport RecordUpdate
 
 cdef unsigned int _DNS_PTR_MIN_TTL
 cdef cython.uint _TYPE_PTR
+cdef cython.uint _TYPE_AAAA
 cdef object _ADDRESS_RECORD_TYPES
 cdef bint TYPE_CHECKING
 cdef object _TYPE_PTR
@@ -38,5 +39,8 @@ cdef class RecordManager:
 
     cpdef void async_remove_listener(self, RecordUpdateListener listener)
 
+    @cython.locals(cached=DNSAddress)
+    cdef DNSAddress _async_merge_address(self, DNSAddress record)
+
     @cython.locals(question=DNSQuestion, record=DNSRecord)
     cdef void _async_update_matching_records(self, RecordUpdateListener listener, cython.list questions)

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_handlers/record_manager.py

@@ -10,13 +10,13 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, cast
 
 from .._cache import _UniqueRecordsType
-from .._dns import DNSQuestion, DNSRecord
+from .._dns import DNSAddress, DNSQuestion, DNSRecord
 from .._logger import log
 from .._protocol.incoming import DNSIncoming
 from .._record_update import RecordUpdate
 from .._updates import RecordUpdateListener
 from .._utils.time import current_time_millis
-from ..const import _ADDRESS_RECORD_TYPES, _DNS_PTR_MIN_TTL, _TYPE_PTR
+from ..const import _ADDRESS_RECORD_TYPES, _DNS_PTR_MIN_TTL, _TYPE_AAAA, _TYPE_PTR
 
 if TYPE_CHECKING:
     from .._core import Zeroconf
@@ -118,6 +118,11 @@ class RecordManager:
                 record = cast(_UniqueRecordsType, record)
 
             maybe_entry = cache.async_get_unique(record)
+            if maybe_entry is None and record_type == _TYPE_AAAA:
+                if TYPE_CHECKING:
+                    assert isinstance(record, DNSAddress)
+                maybe_entry = self._async_merge_address(record)
+
             if not record.is_expired(now):
                 if record_type in _ADDRESS_RECORD_TYPES:
                     address_adds.append(record)
@@ -167,6 +172,17 @@ class RecordManager:
         if updates:
             self.async_updates_complete(new)
 
+    def _async_merge_address(self, record: DNSAddress) -> DNSAddress | None:
+        """Return the cached copy of the AAAA, keeping one per address and preferring a scoped one."""
+        cached = self.cache.async_get_address(record)
+        if cached is None:
+            return None
+        if record.scope_id and not cached.scope_id and record.ttl:
+            self.cache.async_remove_records((cached,))
+            return None
+        record._set_scope_id(cached.scope_id)
+        return cached
+
     def _async_update_matching_records(
         self, listener: RecordUpdateListener, questions: list[_DNSQuestion]
     ) -> None:

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_listener.pxd

@@ -17,6 +17,7 @@ cdef cython.uint _DUPLICATE_PACKET_SUPPRESSION_INTERVAL
 cdef cython.uint _RECENT_PACKETS_MAX
 cdef cython.uint _MAX_DEFERRED_ADDRS
 cdef cython.uint _MAX_DEFERRED_PER_ADDR
+cdef tuple _NOT_SEEN
 
 
 cdef class AsyncListener:
@@ -27,6 +28,7 @@ cdef class AsyncListener:
     cdef QueryHandler _query_handler
     cdef public cython.bytes data
     cdef public double last_time
+    cdef bint _last_scoped
     cdef public DNSIncoming last_message
     cdef public object transport
     cdef public object sock_description
@@ -38,7 +40,7 @@ cdef class AsyncListener:
     @cython.locals(now=double, debug=cython.bint)
     cpdef datagram_received(self, cython.bytes bytes, cython.tuple addrs)
 
-    @cython.locals(msg=DNSIncoming, recent_time=double)
+    @cython.locals(msg=DNSIncoming, recent=tuple, recent_time=double, scoped=bint)
     cpdef _process_datagram_at_time(self, bint debug, cython.uint data_len, double now, bytes data, cython.tuple addrs)
 
     cdef _cancel_any_timers_for_addr(self, object addr)

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_listener.py

@@ -38,6 +38,8 @@ _float = float
 
 DEBUG_ENABLED = partial(log.isEnabledFor, logging.DEBUG)
 
+_NOT_SEEN = (-1e30, True)
+
 
 class AsyncListener:
     """Asyncio datagram protocol that receives mDNS packets and feeds them
@@ -46,6 +48,7 @@ class AsyncListener:
     __slots__ = (
         "_deferred",
         "_deferred_deadlines",
+        "_last_scoped",
         "_query_handler",
         "_recent_packets",
         "_record_manager",
@@ -67,6 +70,7 @@ class AsyncListener:
         self.data: bytes | None = None
         self.last_time: float = 0
         self.last_message: DNSIncoming | None = None
+        self._last_scoped = False
         self.transport: _WrappedTransport | None = None
         self.sock_description: str | None = None
         self._deferred: dict[str, list[DNSIncoming]] = {}
@@ -76,8 +80,10 @@ class AsyncListener:
         # flood cannot defeat single-slot dedup; relies on dict insertion
         # order so the oldest entry is evicted first. Only payloads
         # without a QU question are cached so unicast replies still go
-        # out on every receipt.
-        self._recent_packets: dict[bytes, float] = {}
+        # out on every receipt. Each entry records whether the copy came
+        # from a scoped sender: only that copy scopes link-local AAAA
+        # records, so it is not suppressed by an unscoped one.
+        self._recent_packets: dict[bytes, tuple[float, bool]] = {}
         super().__init__()
 
     def cancel_pending_timers(self) -> None:
@@ -228,8 +234,12 @@ class AsyncListener:
         data: _bytes,
         addrs: tuple[str, int] | tuple[str, int, int, int],
     ) -> None:
+        # Only a response's records take the sender's scope (QR is the top
+        # bit of header byte 2).
+        scoped = len(addrs) == 4 and addrs[3] != 0 and data_len > 2 and (data[2] & 0x80) != 0
         if (
             self.data == data
+            and (self._last_scoped or not scoped)
             and (now - _DUPLICATE_PACKET_SUPPRESSION_INTERVAL) < self.last_time
             and self.last_message is not None
             and not self.last_message.has_qu_question()
@@ -246,7 +256,7 @@ class AsyncListener:
                 )
             return
 
-        # `get(data, -1e30)` keeps the suppression compare a single C
+        # `get(data, _NOT_SEEN)` keeps the suppression compare a single C
         # double compare; the sentinel is far below any real `now -
         # _DUPLICATE_PACKET_SUPPRESSION_INTERVAL` so a cache miss never
         # triggers the branch even when `now` is small (time.monotonic
@@ -254,8 +264,9 @@ class AsyncListener:
         # negative for the first interval after boot). Only non-QU payloads
         # are cached, so any hit here is safe to suppress without re-
         # checking has_qu_question.
-        recent_time = self._recent_packets.get(data, -1e30)
-        if (now - _DUPLICATE_PACKET_SUPPRESSION_INTERVAL) < recent_time:
+        recent = self._recent_packets.get(data, _NOT_SEEN)
+        recent_time = recent[0]
+        if (now - _DUPLICATE_PACKET_SUPPRESSION_INTERVAL) < recent_time and (recent[1] or not scoped):
             # No timestamp refresh on hit so the suppression window
             # ends at first-observation + interval; one parse-and-
             # dispatch fires per payload per interval, capping the
@@ -291,15 +302,16 @@ class AsyncListener:
         self.data = data
         self.last_time = now
         self.last_message = msg
+        self._last_scoped = scoped
         if not msg.has_qu_question():
             # Refresh LRU position when an entry exists but the
             # suppression window has expired; otherwise evict the oldest
             # entry once the window is full.
-            if data in self._recent_packets:
+            if recent is not _NOT_SEEN:
                 del self._recent_packets[data]
             elif len(self._recent_packets) >= _RECENT_PACKETS_MAX:
                 del self._recent_packets[next(iter(self._recent_packets))]
-            self._recent_packets[data] = now
+            self._recent_packets[data] = (now, scoped)
         if msg.valid is True:
             if debug:
                 log.debug(

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_protocol/incoming.pxd

@@ -121,6 +121,7 @@ cdef class DNSIncoming:
         name_start="unsigned int",
         offset="unsigned int",
         address_rec=DNSAddress,
+        address=bytes,
         pointer_rec=DNSPointer,
         text_rec=DNSText,
         srv_rec=DNSService,

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_protocol/incoming.py

@@ -530,14 +530,16 @@ class DNSIncoming:
             )
             return hinfo_rec
         if type_ == _TYPE_AAAA:
+            address = self._read_string(16)
             address_rec = DNSAddress.__new__(DNSAddress)
+            # Zone indexes only apply to link-local fe80::/10 (RFC 4007 section 6).
             address_rec._fast_init(
                 domain,
                 type_,
                 class_,
                 ttl,
-                self._read_string(16),
-                self.scope_id,
+                address,
+                self.scope_id if address[0] == 0xFE and (address[1] & 0xC0) == 0x80 else None,
                 self.now,
             )
             return address_rec

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_services/browser.py

@@ -21,6 +21,7 @@ from types import TracebackType  # used in type hints
 from typing import (
     TYPE_CHECKING,
     Any,
+    Self,
     cast,
 )
 
@@ -762,7 +763,7 @@ class ServiceBrowser(_ServiceBrowserBase, threading.Thread):
             getattr(self, "native_id", self.ident),
         )
 
-    def __enter__(self) -> ServiceBrowser:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(  # pylint: disable=useless-return

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_services/info.py

@@ -783,9 +783,9 @@ class ServiceInfo(RecordUpdateListener):
             ip_addr = get_ip_address_object_from_record(record)
             if ip_addr is None:
                 continue
-            # The cache keeps scoped and unscoped link-local AAAA
-            # records as separate entries because DNSAddress equality
-            # includes scope_id. Collapse them here so each address
+            # Records added to the cache directly, not through the
+            # record manager, can hold scoped and unscoped copies of a
+            # link-local AAAA. Collapse them here so each address
             # appears once; the scoped variant wins so callers of
             # parsed_scoped_addresses() get a %<interface_index>-
             # qualified link-local address when one was observed.

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/_utils/asyncio.py

@@ -10,7 +10,6 @@ from __future__ import annotations
 import asyncio
 import concurrent.futures
 import contextlib
-import sys
 from collections.abc import Awaitable, Coroutine
 from typing import Any
 
@@ -58,7 +57,7 @@ async def wait_future_or_timeout(future: asyncio.Future[bool | None], timeout: f
     try:
         await future
     except asyncio.CancelledError:
-        if sys.version_info >= (3, 11) and (task := asyncio.current_task()) and task.cancelling():
+        if (task := asyncio.current_task()) and task.cancelling():
             raise
     finally:
         handle.cancel()

{zeroconf-0.152.0 → zeroconf-0.153.0}/src/zeroconf/asyncio.py

@@ -11,6 +11,7 @@ import asyncio
 import contextlib
 from collections.abc import Awaitable, Callable
 from types import TracebackType  # used in type hints
+from typing import Self
 
 from ._core import Zeroconf
 from ._dns import DNSQuestionType
@@ -48,7 +49,7 @@ class AsyncServiceBrowser(_ServiceBrowserBase):
         super().__init__(zeroconf, type_, handlers, listener, addr, port, delay, question_type)
         self._async_start()
 
-    async def __aenter__(self) -> AsyncServiceBrowser:
+    async def __aenter__(self) -> Self:
         return self
 
     async def __aexit__(
@@ -138,7 +139,7 @@ class AsyncZeroconf:
         )
         self.async_browsers: dict[ServiceListener, AsyncServiceBrowser] = {}
 
-    async def __aenter__(self) -> AsyncZeroconf:
+    async def __aenter__(self) -> Self:
         return self
 
     async def __aexit__(

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/__init__.py

@@ -20,7 +20,16 @@ from unittest import mock
 
 import ifaddr
 
-from zeroconf import DNSIncoming, DNSOutgoing, DNSQuestion, DNSRecord, ServiceInfo, Zeroconf, const
+from zeroconf import (
+    DNSAddress,
+    DNSIncoming,
+    DNSOutgoing,
+    DNSQuestion,
+    DNSRecord,
+    ServiceInfo,
+    Zeroconf,
+    const,
+)
 from zeroconf._history import QuestionHistory
 
 _MONOTONIC_RESOLUTION = time.get_clock_info("monotonic").resolution
@@ -116,6 +125,23 @@ def make_service_info(
     )
 
 
+def aaaa_response_packet(name: str, *addresses: str) -> bytes:
+    """Build a response packet with one cache-flush AAAA per address, `fe80::1` by default."""
+    generated = DNSOutgoing(const._FLAGS_QR_RESPONSE)
+    for address in addresses or ("fe80::1",):
+        generated.add_answer_at_time(
+            DNSAddress(
+                name,
+                const._TYPE_AAAA,
+                const._CLASS_IN | const._CLASS_UNIQUE,
+                120,
+                socket.inet_pton(socket.AF_INET6, address),
+            ),
+            0,
+        )
+    return generated.packets()[0]
+
+
 def mock_incoming_msg(records: Iterable[DNSRecord]) -> DNSIncoming:
     """Build a `DNSIncoming` response message from a list of `DNSRecord`s."""
     generated = DNSOutgoing(const._FLAGS_QR_RESPONSE)

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/conftest.py

@@ -18,7 +18,7 @@ from zeroconf._services import info as service_info
 from zeroconf.asyncio import AsyncZeroconf
 
 # The dev dependency group only installs hypothesis on CPython (the CI
-# matrix pins pypy-3.10 and hypothesis ships no pp310 wheels), and a
+# matrix pins pypy-3.11 and hypothesis ships no pp311 wheels), and a
 # non-dev install has no hypothesis at all.
 collect_ignore: list[str] = []
 if importlib.util.find_spec("hypothesis") is None:
@@ -45,7 +45,7 @@ _BENCHMARKS_DIR = "tests/benchmarks"
 # `test_async_service_registration*` and `test_async_tasks` entries
 # share a single root cause: `Zeroconf.async_close()` -> ... ->
 # `ServiceBrowser.cancel()` calls `Thread.join()` to drain the
-# dedicated browser thread, and on Python 3.10-3.12 the thread is
+# dedicated browser thread, and on Python 3.11-3.12 the thread is
 # still alive when the join happens. `test_use_asyncio_false_*` is
 # by design (sync bootstrap when `use_asyncio=False` is requested from
 # inside a running loop); `test_run_coro_with_timeout` exercises the

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/services/test_browser.py

@@ -35,6 +35,7 @@ from .. import (
     _restamp_cache,
     _wait_for,
     _wait_for_start,
+    aaaa_response_packet,
     has_working_ipv6,
     make_service_info,
     mock_incoming_msg,
@@ -1686,3 +1687,40 @@ async def test_close_zeroconf_without_browser_after_start_up_queries(quick_timin
         finally:
             await aio_zeroconf_registrar.async_close()
             await browser.async_cancel()
+
+
+def test_service_browser_aaaa_scope_variant_does_not_trigger_update(zc: Zeroconf) -> None:
+    """A cached AAAA arriving again under another scope fires no Updated."""
+    type_ = "_hap._tcp.local."
+    registration_name = f"xxxyyy.{type_}"
+    updates: list[str] = []
+    service_added = Event()
+
+    class MyServiceListener(r.ServiceListener):
+        def add_service(self, zc, type_, name) -> None:  # type: ignore[no-untyped-def]
+            if name == registration_name:
+                service_added.set()
+
+        def remove_service(self, zc, type_, name) -> None:  # type: ignore[no-untyped-def]
+            pass
+
+        def update_service(self, zc, type_, name) -> None:  # type: ignore[no-untyped-def]
+            if name == registration_name:
+                updates.append(name)
+
+    browser = r.ServiceBrowser(zc, type_, None, MyServiceListener())
+    try:
+        info = make_service_info(type_, registration_name, addresses=[socket.inet_aton("10.7.4.2")])
+        _inject_response(zc, mock_incoming_msg([info.dns_pointer(), info.dns_service(), info.dns_text()]))
+        assert service_added.wait(timeout=5)
+
+        assert info.server is not None
+        packet = aaaa_response_packet(info.server)
+        _inject_response(zc, r.DNSIncoming(packet, ("fe80::2", 5353), 31))
+        assert _wait_for(lambda: len(updates) == 1)
+        _inject_response(zc, r.DNSIncoming(packet, ("::ffff:10.7.4.3", 5353), 0))
+        _inject_response(zc, r.DNSIncoming(packet, ("fe80::2", 5353), 15))
+        time.sleep(0.2)
+        assert updates == [registration_name]
+    finally:
+        browser.cancel()

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/services/test_info.py

@@ -28,6 +28,7 @@ from zeroconf.asyncio import AsyncZeroconf
 from .. import (
     QUICK_REQUEST_TIMEOUT_MS,
     _inject_response,
+    aaaa_response_packet,
     has_working_ipv6,
     make_service_info,
     mock_incoming_msg,
@@ -3022,3 +3023,21 @@ def test_addresses_setter_rejects_invalid_address():
     info = ServiceInfo(type_, f"xxxyyy.{type_}", 80, server="spare-rig.local.")
     with pytest.raises(TypeError, match="Addresses must either be"):
         info.addresses = ["not an address"]
+
+
+@pytest.mark.asyncio
+async def test_aaaa_known_answer_sent_once_per_address() -> None:
+    """An AAAA received under several scopes is sent as one known answer."""
+    aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
+    zc = aiozc.zeroconf
+    packet = aaaa_response_packet("host.local.")
+    for source, scope in ((("fe80::2", 5353), 2), (("::ffff:192.0.2.1", 5353), 0)):
+        zc.record_manager.async_updates_from_response(r.DNSIncoming(packet, source, scope))
+    sent: list[DNSOutgoing] = []
+    info = ServiceInfo("_test._tcp.local.", "x._test._tcp.local.", server="host.local.")
+    with patch.object(zc, "async_send", lambda out, *args, **kwargs: sent.append(out)):
+        await info.async_request(zc, timeout=200)
+    assert sent
+    for out in sent:
+        assert [record.type for record, _ in out.answers].count(const._TYPE_AAAA) == 1
+    await aiozc.async_close()

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/test_handlers.py

@@ -23,7 +23,7 @@ from zeroconf._handlers.multicast_outgoing_queue import (
 from zeroconf._utils.time import millis_to_seconds
 from zeroconf.asyncio import AsyncZeroconf
 
-from . import _clear_cache, _inject_response, has_working_ipv6, make_service_info
+from . import _clear_cache, _inject_response, aaaa_response_packet, has_working_ipv6, make_service_info
 
 log = logging.getLogger("zeroconf")
 original_logging_level = logging.NOTSET
@@ -1839,3 +1839,68 @@ async def test_async_updates_complete_iteration_safe():
     # This should not raise RuntimeError: set changed size during iteration
     zc.record_manager.async_updates_complete(False)
     await aiozc.async_close()
+
+
+@pytest.mark.parametrize("scopes", [(0, 2), (2, 0), (None, 2), (2, 15)])
+@pytest.mark.asyncio
+async def test_aaaa_cached_once_per_address(scopes: tuple[int | None, int | None]) -> None:
+    """The cache keeps one AAAA per address, preferring a scoped copy and then the first scope."""
+    aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
+    zc = aiozc.zeroconf
+    packet = aaaa_response_packet("host.local.")
+    for scope in scopes:
+        zc.record_manager.async_updates_from_response(r.DNSIncoming(packet, ("fe80::2", 5353), scope))
+    records = zc.cache.async_all_by_details("host.local.", const._TYPE_AAAA, const._CLASS_IN)
+    assert [cast(r.DNSAddress, record).scope_id for record in records] == [2]
+    await aiozc.async_close()
+
+
+@pytest.mark.asyncio
+async def test_aaaa_unscoped_copy_refreshes_scoped() -> None:
+    """An unscoped cache-flush copy refreshes the cached scoped AAAA."""
+    aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
+    zc = aiozc.zeroconf
+    packet = aaaa_response_packet("host.local.")
+    now = current_time_millis()
+    zc.record_manager.async_updates_from_response(r.DNSIncoming(packet, ("fe80::2", 5353), 2, now - 2000))
+    zc.record_manager.async_updates_from_response(r.DNSIncoming(packet, ("::ffff:192.0.2.1", 5353), 0, now))
+    (record,) = zc.cache.async_all_by_details("host.local.", const._TYPE_AAAA, const._CLASS_IN)
+    assert cast(r.DNSAddress, record).scope_id == 2
+    assert record.ttl == 120
+    assert record.created == now
+    await aiozc.async_close()
+
+
+@pytest.mark.parametrize(("cached_scope", "goodbye_scope"), [(2, 0), (0, 2), (2, 15)])
+@pytest.mark.asyncio
+async def test_aaaa_goodbye_under_another_scope_removes_cached(cached_scope: int, goodbye_scope: int) -> None:
+    """A goodbye for an address removes and reports its cached AAAA whatever scope either came with."""
+    aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
+    zc = aiozc.zeroconf
+    zc.record_manager.async_updates_from_response(
+        r.DNSIncoming(aaaa_response_packet("host.local."), ("fe80::2", 5353), cached_scope)
+    )
+    updates: list[r.RecordUpdate] = []
+
+    class EventStore(r.RecordUpdateListener):
+        def async_update_records(self, zc: Zeroconf, now: float, records: list[r.RecordUpdate]) -> None:
+            updates.extend(records)
+
+    zc.record_manager.async_add_listener(EventStore(), None)
+    goodbye = r.DNSOutgoing(const._FLAGS_QR_RESPONSE)
+    goodbye.add_answer_at_time(
+        r.DNSAddress(
+            "host.local.",
+            const._TYPE_AAAA,
+            const._CLASS_IN | const._CLASS_UNIQUE,
+            0,
+            socket.inet_pton(socket.AF_INET6, "fe80::1"),
+        ),
+        0,
+    )
+    zc.record_manager.async_updates_from_response(
+        r.DNSIncoming(goodbye.packets()[0], ("fe80::2", 5353), goodbye_scope)
+    )
+    assert zc.cache.async_all_by_details("host.local.", const._TYPE_AAAA, const._CLASS_IN) == []
+    assert [(update.new.ttl, update.old is not None) for update in updates] == [(0, True)]
+    await aiozc.async_close()

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/test_listener.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import logging
 import unittest
 import unittest.mock
+from typing import cast
 from unittest.mock import MagicMock, patch
 
 import zeroconf as r
@@ -19,7 +20,7 @@ from zeroconf import (
 from zeroconf._protocol import outgoing
 from zeroconf._protocol.incoming import DNSIncoming
 
-from . import QuestionHistoryWithoutSuppression
+from . import QuestionHistoryWithoutSuppression, aaaa_response_packet
 
 log = logging.getLogger("zeroconf")
 original_logging_level = logging.NOTSET
@@ -275,6 +276,64 @@ def test_guard_against_duplicate_packets(zc: Zeroconf) -> None:
         _handle_query_or_defer.reset_mock()
 
 
+def test_guard_against_duplicate_packets_per_sender_scope(zc: Zeroconf) -> None:
+    """A scoped copy of a response follows an unscoped one, and suppresses later copies from any sender."""
+    listener = _listener.AsyncListener(zc)
+    listener.transport = MagicMock()
+    packet = aaaa_response_packet("peer.local.")
+    other_packet = aaaa_response_packet("other.local.")
+    v4_mapped = ("::ffff:192.0.2.1", 5353, 0, 0)
+    v6_link_local = ("fe80::2", 5353, 0, 2)
+
+    now = current_time_millis()
+    listener._process_datagram_at_time(False, len(packet), now, packet, v4_mapped)
+    listener._process_datagram_at_time(False, len(packet), now, packet, v6_link_local)
+    (record,) = zc.cache.async_all_by_details("peer.local.", const._TYPE_AAAA, const._CLASS_IN)
+    assert cast(r.DNSAddress, record).scope_id == 2
+
+    listener._process_datagram_at_time(False, len(other_packet), now, other_packet, v4_mapped)
+    processed = listener.last_message
+    for addrs in (v4_mapped, v6_link_local, ("fe80::2", 5353, 0, 15)):
+        listener._process_datagram_at_time(False, len(packet), now, packet, addrs)
+    assert listener.last_message is processed
+
+
+def test_guard_against_duplicate_queries_across_sender_scopes(zc: Zeroconf) -> None:
+    """The scoped copy of a query is still suppressed as a duplicate of the unscoped one."""
+    zc.registry.async_add(
+        ServiceInfo(
+            "_http._tcp.local.",
+            "Test._http._tcp.local.",
+            server="Test._http._tcp.local.",
+            port=4,
+        )
+    )
+    handled: list[tuple[str, int]] = []
+
+    class SubListener(_listener.AsyncListener):
+        def handle_query_or_defer(
+            self,
+            msg: DNSIncoming,
+            addr: str,
+            port: int,
+            transport: _engine._WrappedTransport,
+            v6_flow_scope: tuple[()] | tuple[int, int] = (),
+        ) -> None:
+            handled.append((addr, port))
+
+    listener = SubListener(zc)
+    listener.transport = MagicMock()
+
+    query = r.DNSOutgoing(const._FLAGS_QR_QUERY)
+    query.add_question(r.DNSQuestion("peer.local.", const._TYPE_AAAA, const._CLASS_IN))
+    packet = query.packets()[0]
+
+    now = current_time_millis()
+    listener._process_datagram_at_time(False, len(packet), now, packet, ("::ffff:192.0.2.1", 5353, 0, 0))
+    listener._process_datagram_at_time(False, len(packet), now, packet, ("fe80::2", 5353, 0, 2))
+    assert handled == [("::ffff:192.0.2.1", 5353)]
+
+
 def test_guard_against_alternating_duplicate_packets(zc: Zeroconf) -> None:
     """Alternating two distinct payloads must not bypass duplicate suppression."""
     zc.registry.async_add(

{zeroconf-0.152.0 → zeroconf-0.153.0}/tests/test_protocol.py

@@ -16,7 +16,7 @@ from zeroconf import DNSHinfo, DNSIncoming, DNSText, const, current_time_millis
 from zeroconf._logger import _MAX_SEEN_LOGS
 from zeroconf._protocol import incoming as _incoming_module
 
-from . import add_question_batch, has_working_ipv6
+from . import aaaa_response_packet, add_question_batch, has_working_ipv6
 
 log = logging.getLogger("zeroconf")
 original_logging_level = logging.NOTSET
@@ -1497,3 +1497,10 @@ def test_hinfo_second_character_string_missing_skips_record() -> None:
     parsed = r.DNSIncoming(packet)
     assert parsed.valid is True
     assert parsed.answers() == []
+
+
+def test_aaaa_scope_only_applied_to_link_local() -> None:
+    """Only link-local AAAA records take the receiving scope."""
+    packet = aaaa_response_packet("host.local.", "fe80::1", "2001:db8::1")
+    answers = cast("list[r.DNSAddress]", r.DNSIncoming(packet, ("fe80::2", 5353), 2).answers())
+    assert [answer.scope_id for answer in answers] == [2, None]