Skip to content

chore: make zeroconf._services.info compatible with Cython 3.1 #1576

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
merged 2 commits into from
May 3, 2025
Merged

chore: make zeroconf._services.info compatible with Cython 3.1 #1576

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd0c10
chore: make zeroconf._services.info compatible with Cython 3.1
bdraco May 3, 2025
5c55e9a
Merge branch 'master' into info_py_cython_31
bdraco May 3, 2025
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
24 changes: 12 additions & 12 deletions src/zeroconf/_services/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,15 +577,15 @@ def _process_record_threadsafe(self, zc: Zeroconf, record: DNSRecord, now: float

def dns_addresses(
self,
override_ttl: int | None = None,
override_ttl: int_ | None = None,
version: IPVersion = IPVersion.All,
) -> list[DNSAddress]:
"""Return matching DNSAddress from ServiceInfo."""
return self._dns_addresses(override_ttl, version)

def _dns_addresses(
self,
override_ttl: int | None,
override_ttl: int_ | None,
version: IPVersion,
) -> list[DNSAddress]:
"""Return matching DNSAddress from ServiceInfo."""
Expand All @@ -611,11 +611,11 @@ def _dns_addresses(
self._dns_address_cache = records
return records

def dns_pointer(self, override_ttl: int | None = None) -> DNSPointer:
def dns_pointer(self, override_ttl: int_ | None = None) -> DNSPointer:
"""Return DNSPointer from ServiceInfo."""
return self._dns_pointer(override_ttl)

def _dns_pointer(self, override_ttl: int | None) -> DNSPointer:
def _dns_pointer(self, override_ttl: int_ | None) -> DNSPointer:
"""Return DNSPointer from ServiceInfo."""
cacheable = override_ttl is None
if self._dns_pointer_cache is not None and cacheable:
Expand All @@ -632,11 +632,11 @@ def _dns_pointer(self, override_ttl: int | None) -> DNSPointer:
self._dns_pointer_cache = record
return record

def dns_service(self, override_ttl: int | None = None) -> DNSService:
def dns_service(self, override_ttl: int_ | None = None) -> DNSService:
"""Return DNSService from ServiceInfo."""
return self._dns_service(override_ttl)

def _dns_service(self, override_ttl: int | None) -> DNSService:
def _dns_service(self, override_ttl: int_ | None) -> DNSService:
"""Return DNSService from ServiceInfo."""
cacheable = override_ttl is None
if self._dns_service_cache is not None and cacheable:
Expand All @@ -659,11 +659,11 @@ def _dns_service(self, override_ttl: int | None) -> DNSService:
self._dns_service_cache = record
return record

def dns_text(self, override_ttl: int | None = None) -> DNSText:
def dns_text(self, override_ttl: int_ | None = None) -> DNSText:
"""Return DNSText from ServiceInfo."""
return self._dns_text(override_ttl)

def _dns_text(self, override_ttl: int | None) -> DNSText:
def _dns_text(self, override_ttl: int_ | None) -> DNSText:
"""Return DNSText from ServiceInfo."""
cacheable = override_ttl is None
if self._dns_text_cache is not None and cacheable:
Expand All @@ -680,11 +680,11 @@ def _dns_text(self, override_ttl: int | None) -> DNSText:
self._dns_text_cache = record
return record

def dns_nsec(self, missing_types: list[int], override_ttl: int | None = None) -> DNSNsec:
def dns_nsec(self, missing_types: list[int], override_ttl: int_ | None = None) -> DNSNsec:
"""Return DNSNsec from ServiceInfo."""
return self._dns_nsec(missing_types, override_ttl)

def _dns_nsec(self, missing_types: list[int], override_ttl: int | None) -> DNSNsec:
def _dns_nsec(self, missing_types: list[int], override_ttl: int_ | None) -> DNSNsec:
"""Return DNSNsec from ServiceInfo."""
return DNSNsec(
self._name,
Expand All @@ -696,11 +696,11 @@ def _dns_nsec(self, missing_types: list[int], override_ttl: int | None) -> DNSNs
0.0,
)

def get_address_and_nsec_records(self, override_ttl: int | None = None) -> set[DNSRecord]:
def get_address_and_nsec_records(self, override_ttl: int_ | None = None) -> set[DNSRecord]:
"""Build a set of address records and NSEC records for non-present record types."""
return self._get_address_and_nsec_records(override_ttl)

def _get_address_and_nsec_records(self, override_ttl: int | None) -> set[DNSRecord]:
def _get_address_and_nsec_records(self, override_ttl: int_ | None) -> set[DNSRecord]:
"""Build a set of address records and NSEC records for non-present record types."""
cacheable = override_ttl is None
if self._get_address_and_nsec_records_cache is not None and cacheable:
Expand Down
Loading