Skip to content

chore: remove legacy code <py39 #1466

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 8, 2025
Merged

chore: remove legacy code <py39 #1466

Show file tree
Hide file tree
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
5 changes: 1 addition & 4 deletions src/zeroconf/_services/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import asyncio
import random
import sys
from typing import TYPE_CHECKING, Dict, List, Optional, Set, Union, cast

from .._cache import DNSCache
Expand Down Expand Up @@ -77,8 +76,6 @@
_TYPE_TXT,
)

IPADDRESS_SUPPORTS_SCOPE_ID = sys.version_info >= (3, 9, 0)

_IPVersion_All_value = IPVersion.All.value
_IPVersion_V4Only_value = IPVersion.V4Only.value
# https://datatracker.ietf.org/doc/html/rfc6762#section-5.2
Expand Down Expand Up @@ -250,7 +247,7 @@ def addresses(self, value: List[bytes]) -> None:
self._get_address_and_nsec_records_cache = None

for address in value:
if IPADDRESS_SUPPORTS_SCOPE_ID and len(address) == 16 and self.interface_index is not None:
if len(address) == 16 and self.interface_index is not None:
addr = ip_bytes_and_scope_to_address(address, self.interface_index)
else:
addr = cached_ip_addresses(address)
Expand Down
13 changes: 3 additions & 10 deletions src/zeroconf/_utils/ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,15 @@
USA
"""

import sys
from functools import lru_cache
from functools import cache, lru_cache
from ipaddress import AddressValueError, IPv4Address, IPv6Address, NetmaskValueError
from typing import Any, Optional, Union

from .._dns import DNSAddress
from ..const import _TYPE_AAAA

if sys.version_info >= (3, 9, 0):
from functools import cache
else:
cache = lru_cache(maxsize=None)

bytes_ = bytes
int_ = int
IPADDRESS_SUPPORTS_SCOPE_ID = sys.version_info >= (3, 9, 0)


class ZeroconfIPv4Address(IPv4Address):
Expand Down Expand Up @@ -128,7 +121,7 @@ def get_ip_address_object_from_record(
record: DNSAddress,
) -> Optional[Union[ZeroconfIPv4Address, ZeroconfIPv6Address]]:
"""Get the IP address object from the record."""
if IPADDRESS_SUPPORTS_SCOPE_ID and record.type == _TYPE_AAAA and record.scope_id:
if record.type == _TYPE_AAAA and record.scope_id:
return ip_bytes_and_scope_to_address(record.address, record.scope_id)
return cached_ip_addresses_wrapper(record.address)

Expand All @@ -146,7 +139,7 @@ def ip_bytes_and_scope_to_address(

def str_without_scope_id(addr: Union[ZeroconfIPv4Address, ZeroconfIPv6Address]) -> str:
"""Return the string representation of the address without the scope id."""
if IPADDRESS_SUPPORTS_SCOPE_ID and addr.version == 6:
if addr.version == 6:
address_str = str(addr)
return address_str.partition("%")[0]
return str(addr)
Expand Down
15 changes: 4 additions & 11 deletions tests/services/test_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import logging
import os
import socket
import sys
import threading
import unittest
from ipaddress import ip_address
Expand Down Expand Up @@ -704,7 +703,6 @@ def test_multiple_addresses():
assert info.addresses == [address, address]
assert info.parsed_addresses() == [address_parsed, address_parsed]
assert info.parsed_scoped_addresses() == [address_parsed, address_parsed]
ipaddress_supports_scope_id = sys.version_info >= (3, 9, 0)

if has_working_ipv6() and not os.environ.get("SKIP_IPV6"):
address_v6_parsed = "2001:db8::1"
Expand Down Expand Up @@ -751,9 +749,7 @@ def test_multiple_addresses():
assert info.ip_addresses_by_version(r.IPVersion.All) == [
ip_address(address),
ip_address(address_v6),
ip_address(address_v6_ll_scoped_parsed)
if ipaddress_supports_scope_id
else ip_address(address_v6_ll),
ip_address(address_v6_ll_scoped_parsed),
]
assert info.addresses_by_version(r.IPVersion.V4Only) == [address]
assert info.ip_addresses_by_version(r.IPVersion.V4Only) == [ip_address(address)]
Expand All @@ -763,9 +759,7 @@ def test_multiple_addresses():
]
assert info.ip_addresses_by_version(r.IPVersion.V6Only) == [
ip_address(address_v6),
ip_address(address_v6_ll_scoped_parsed)
if ipaddress_supports_scope_id
else ip_address(address_v6_ll),
ip_address(address_v6_ll_scoped_parsed),
]
assert info.parsed_addresses() == [
address_parsed,
Expand All @@ -780,16 +774,15 @@ def test_multiple_addresses():
assert info.parsed_scoped_addresses() == [
address_parsed,
address_v6_parsed,
address_v6_ll_scoped_parsed if ipaddress_supports_scope_id else address_v6_ll_parsed,
address_v6_ll_scoped_parsed,
]
assert info.parsed_scoped_addresses(r.IPVersion.V4Only) == [address_parsed]
assert info.parsed_scoped_addresses(r.IPVersion.V6Only) == [
address_v6_parsed,
address_v6_ll_scoped_parsed if ipaddress_supports_scope_id else address_v6_ll_parsed,
address_v6_ll_scoped_parsed,
]


@unittest.skipIf(sys.version_info < (3, 9, 0), "Requires newer python")
def test_scoped_addresses_from_cache():
type_ = "_http._tcp.local."
registration_name = f"scoped.{type_}"
Expand Down
5 changes: 0 additions & 5 deletions tests/utils/test_ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

"""Unit tests for zeroconf._utils.ipaddress."""

import sys

import pytest

from zeroconf import const
from zeroconf._dns import DNSAddress
from zeroconf._utils import ipaddress
Expand Down Expand Up @@ -52,7 +48,6 @@ def test_cached_ip_addresses_wrapper():
assert ipv6.is_unspecified is True


@pytest.mark.skipif(sys.version_info < (3, 9, 0), reason="scope_id is not supported")
def test_get_ip_address_object_from_record():
"""Test the get_ip_address_object_from_record."""
# not link local
Expand Down