Merge branch 'master' into running_event

bdraco · web-flow · commit 9d28cc37d098 · 2025-01-31T13:51:09.000-06:00
diff --git a/examples/browser.py b/examples/browser.py
@@ -5,6 +5,8 @@
 The default is HTTP and HAP; use --find to search for all available services in the network
 """
 
+from __future__ import annotations
+
 import argparse
 import logging
 from time import sleep
diff --git a/examples/registration.py b/examples/registration.py
@@ -2,6 +2,8 @@
 
 """Example of announcing a service (in this case, a fake HTTP server)"""
 
+from __future__ import annotations
+
 import argparse
 import logging
 import socket
diff --git a/examples/resolve_address.py b/examples/resolve_address.py
@@ -2,6 +2,8 @@
 
 """Example of resolving a name to an IP address."""
 
+from __future__ import annotations
+
 import asyncio
 import logging
 import sys
diff --git a/examples/resolver.py b/examples/resolver.py
@@ -2,6 +2,8 @@
 
 """Example of resolving a service with a known name"""
 
+from __future__ import annotations
+
 import logging
 import sys
 
diff --git a/examples/self_test.py b/examples/self_test.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import annotations
 
 import logging
 import socket
diff --git a/tests/benchmarks/__init__.py b/tests/benchmarks/__init__.py
@@ -0,0 +1 @@
+from __future__ import annotations
diff --git a/tests/benchmarks/helpers.py b/tests/benchmarks/helpers.py
@@ -1,5 +1,7 @@
 """Benchmark helpers."""
 
+from __future__ import annotations
+
 import socket
 
 from zeroconf import DNSAddress, DNSOutgoing, DNSService, DNSText, const
diff --git a/tests/benchmarks/test_cache.py b/tests/benchmarks/test_cache.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pytest_codspeed import BenchmarkFixture
 
 from zeroconf import DNSCache, DNSPointer, current_time_millis
diff --git a/tests/benchmarks/test_incoming.py b/tests/benchmarks/test_incoming.py
@@ -1,5 +1,7 @@
 """Benchmark for DNSIncoming."""
 
+from __future__ import annotations
+
 import socket
 
 from pytest_codspeed import BenchmarkFixture
diff --git a/tests/benchmarks/test_outgoing.py b/tests/benchmarks/test_outgoing.py
@@ -1,5 +1,7 @@
 """Benchmark for DNSOutgoing."""
 
+from __future__ import annotations
+
 from pytest_codspeed import BenchmarkFixture
 
 from zeroconf._protocol.outgoing import State
diff --git a/tests/benchmarks/test_send.py b/tests/benchmarks/test_send.py
@@ -1,5 +1,7 @@
 """Benchmark for sending packets."""
 
+from __future__ import annotations
+
 import pytest
 from pytest_codspeed import BenchmarkFixture
 
diff --git a/tests/benchmarks/test_txt_properties.py b/tests/benchmarks/test_txt_properties.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pytest_codspeed import BenchmarkFixture
 
 from zeroconf import ServiceInfo
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,7 @@
 """conftest for zeroconf tests."""
 
+from __future__ import annotations
+
 import threading
 from unittest.mock import patch
 
diff --git a/tests/services/__init__.py b/tests/services/__init__.py
@@ -19,3 +19,5 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
 USA
 """
+
+from __future__ import annotations
diff --git a/tests/services/test_browser.py b/tests/services/test_browser.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._services.browser."""
 
+from __future__ import annotations
+
 import asyncio
 import logging
 import os
@@ -863,7 +865,7 @@ def test_legacy_record_update_listener():
     class LegacyRecordUpdateListener(r.RecordUpdateListener):
         """A RecordUpdateListener that does not implement update_records."""
 
-        def update_record(self, zc: "Zeroconf", now: float, record: r.DNSRecord) -> None:
+        def update_record(self, zc: Zeroconf, now: float, record: r.DNSRecord) -> None:
             nonlocal updates
             updates.append(record)
 
diff --git a/tests/services/test_registry.py b/tests/services/test_registry.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._services.registry."""
 
+from __future__ import annotations
+
 import socket
 import unittest
 
diff --git a/tests/services/test_types.py b/tests/services/test_types.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._services.types."""
 
+from __future__ import annotations
+
 import logging
 import os
 import socket
diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py
@@ -1,5 +1,7 @@
 """Unit tests for aio.py."""
 
+from __future__ import annotations
+
 import asyncio
 import logging
 import os
diff --git a/tests/test_cache.py b/tests/test_cache.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._cache."""
 
+from __future__ import annotations
+
 import logging
 import unittest.mock
 from heapq import heapify, heappop
diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py
@@ -1,5 +1,7 @@
 """Test to check for circular imports."""
 
+from __future__ import annotations
+
 import asyncio
 import sys
 
diff --git a/tests/test_dns.py b/tests/test_dns.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._dns."""
 
+from __future__ import annotations
+
 import logging
 import os
 import socket
diff --git a/tests/test_engine.py b/tests/test_engine.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._engine"""
 
+from __future__ import annotations
+
 import asyncio
 import itertools
 import logging
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._exceptions"""
 
+from __future__ import annotations
+
 import logging
 import unittest.mock
 
diff --git a/tests/test_handlers.py b/tests/test_handlers.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._handlers"""
 
+from __future__ import annotations
+
 import asyncio
 import logging
 import os
@@ -1371,7 +1373,7 @@ async def test_record_update_manager_add_listener_callsback_existing_records():
     class MyListener(r.RecordUpdateListener):
         """A RecordUpdateListener that does not implement update_records."""
 
-        def async_update_records(self, zc: "Zeroconf", now: float, records: list[r.RecordUpdate]) -> None:
+        def async_update_records(self, zc: Zeroconf, now: float, records: list[r.RecordUpdate]) -> None:
             """Update multiple records in one shot."""
             updated.extend(records)
 
@@ -1973,7 +1975,7 @@ async def test_add_listener_warns_when_not_using_record_update_listener(caplog):
     class MyListener:
         """A RecordUpdateListener that does not implement update_records."""
 
-        def async_update_records(self, zc: "Zeroconf", now: float, records: list[r.RecordUpdate]) -> None:
+        def async_update_records(self, zc: Zeroconf, now: float, records: list[r.RecordUpdate]) -> None:
             """Update multiple records in one shot."""
             updated.extend(records)
 
@@ -2005,7 +2007,7 @@ async def test_async_updates_iteration_safe():
     class OtherListener(r.RecordUpdateListener):
         """A RecordUpdateListener that does not implement update_records."""
 
-        def async_update_records(self, zc: "Zeroconf", now: float, records: list[r.RecordUpdate]) -> None:
+        def async_update_records(self, zc: Zeroconf, now: float, records: list[r.RecordUpdate]) -> None:
             """Update multiple records in one shot."""
             updated.extend(records)
 
@@ -2014,7 +2016,7 @@ def async_update_records(self, zc: "Zeroconf", now: float, records: list[r.Recor
     class ListenerThatAddsListener(r.RecordUpdateListener):
         """A RecordUpdateListener that does not implement update_records."""
 
-        def async_update_records(self, zc: "Zeroconf", now: float, records: list[r.RecordUpdate]) -> None:
+        def async_update_records(self, zc: Zeroconf, now: float, records: list[r.RecordUpdate]) -> None:
             """Update multiple records in one shot."""
             updated.extend(records)
             zc.async_add_listener(other, None)
diff --git a/tests/test_history.py b/tests/test_history.py
@@ -1,5 +1,7 @@
 """Unit tests for _history.py."""
 
+from __future__ import annotations
+
 import zeroconf as r
 import zeroconf.const as const
 from zeroconf._history import QuestionHistory
diff --git a/tests/test_init.py b/tests/test_init.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf.py"""
 
+from __future__ import annotations
+
 import logging
 import socket
 import time
diff --git a/tests/test_logger.py b/tests/test_logger.py
@@ -1,5 +1,7 @@
 """Unit tests for logger.py."""
 
+from __future__ import annotations
+
 import logging
 from unittest.mock import call, patch
 
diff --git a/tests/test_protocol.py b/tests/test_protocol.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._protocol"""
 
+from __future__ import annotations
+
 import copy
 import logging
 import os
diff --git a/tests/test_services.py b/tests/test_services.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._services."""
 
+from __future__ import annotations
+
 import logging
 import os
 import socket
diff --git a/tests/test_updates.py b/tests/test_updates.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._updates."""
 
+from __future__ import annotations
+
 import logging
 import socket
 import time
@@ -45,7 +47,7 @@ def test_legacy_record_update_listener():
     class LegacyRecordUpdateListener(r.RecordUpdateListener):
         """A RecordUpdateListener that does not implement update_records."""
 
-        def update_record(self, zc: "Zeroconf", now: float, record: r.DNSRecord) -> None:
+        def update_record(self, zc: Zeroconf, now: float, record: r.DNSRecord) -> None:
             nonlocal updates
             updates.append(record)
 
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
@@ -19,3 +19,5 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
 USA
 """
+
+from __future__ import annotations
diff --git a/tests/utils/test_ipaddress.py b/tests/utils/test_ipaddress.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._utils.ipaddress."""
 
+from __future__ import annotations
+
 from zeroconf import const
 from zeroconf._dns import DNSAddress
 from zeroconf._utils import ipaddress
diff --git a/tests/utils/test_name.py b/tests/utils/test_name.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._utils.name."""
 
+from __future__ import annotations
+
 import socket
 
 import pytest
diff --git a/tests/utils/test_net.py b/tests/utils/test_net.py
@@ -1,5 +1,7 @@
 """Unit tests for zeroconf._utils.net."""
 
+from __future__ import annotations
+
 import errno
 import socket
 import unittest

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/usr/bin/env python`
	`2`	`+from __future__ import annotations`
`2`	`3`
`3`	`4`	`import logging`
`4`	`5`	`import socket`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`from pytest_codspeed import BenchmarkFixture`
`2`	`4`
`3`	`5`	`from zeroconf import DNSCache, DNSPointer, current_time_millis`