use internal name for internal · python-zeroconf/python-zeroconf@92d9887

@@ -388,7 +388,7 @@ def _unpack_text_into_properties(self) -> None:

388388389389

def get_name(self) -> str:

390390

"""Name accessor"""

391-

return self.name[: len(self.name) - len(self.type) - 1]

391+

return self._name[: len(self._name) - len(self.type) - 1]

392392393393

def _get_ip_addresses_from_cache_lifo(

394394

self, zc: 'Zeroconf', now: float, type: int

@@ -529,7 +529,7 @@ def dns_addresses(

529529

created: Optional[float] = None,

530530

) -> List[DNSAddress]:

531531

"""Return matching DNSAddress from ServiceInfo."""

532-

name = self.server or self.name

532+

name = self.server or self._name

533533

ttl = override_ttl if override_ttl is not None else self.host_ttl

534534

class_ = _CLASS_IN_UNIQUE

535535

version_value = version.value

@@ -552,7 +552,7 @@ def dns_pointer(self, override_ttl: Optional[int] = None, created: Optional[floa

552552

_TYPE_PTR,

553553

_CLASS_IN,

554554

override_ttl if override_ttl is not None else self.other_ttl,

555-

self.name,

555+

self._name,

556556

created,

557557

)

558558

@@ -562,21 +562,21 @@ def dns_service(self, override_ttl: Optional[int] = None, created: Optional[floa

562562

if TYPE_CHECKING:

563563

assert isinstance(port, int)

564564

return DNSService(

565-

self.name,

565+

self._name,

566566

_TYPE_SRV,

567567

_CLASS_IN_UNIQUE,

568568

override_ttl if override_ttl is not None else self.host_ttl,

569569

self.priority,

570570

self.weight,

571571

port,

572-

self.server or self.name,

572+

self.server or self._name,

573573

created,

574574

)

575575576576

def dns_text(self, override_ttl: Optional[int] = None, created: Optional[float] = None) -> DNSText:

577577

"""Return DNSText from ServiceInfo."""

578578

return DNSText(

579-

self.name,

579+

self._name,

580580

_TYPE_TXT,

581581

_CLASS_IN_UNIQUE,

582582

override_ttl if override_ttl is not None else self.other_ttl,

@@ -589,11 +589,11 @@ def dns_nsec(

589589

) -> DNSNsec:

590590

"""Return DNSNsec from ServiceInfo."""

591591

return DNSNsec(

592-

self.name,

592+

self._name,

593593

_TYPE_NSEC,

594594

_CLASS_IN_UNIQUE,

595595

override_ttl if override_ttl is not None else self.host_ttl,

596-

self.name,

596+

self._name,

597597

missing_types,

598598

created,

599599

)

@@ -624,7 +624,7 @@ def set_server_if_missing(self) -> None:

624624

This function is for backwards compatibility.

625625

"""

626626

if self.server is None:

627-

self.server = self.name

627+

self.server = self._name

628628

self.server_key = self.server.lower()

629629630630

def load_from_cache(self, zc: 'Zeroconf', now: Optional[float] = None) -> bool:

@@ -635,10 +635,10 @@ def load_from_cache(self, zc: 'Zeroconf', now: Optional[float] = None) -> bool:

635635

if not now:

636636

now = current_time_millis()

637637

original_server_key = self.server_key

638-

cached_srv_record = zc.cache.get_by_details(self.name, _TYPE_SRV, _CLASS_IN)

638+

cached_srv_record = zc.cache.get_by_details(self._name, _TYPE_SRV, _CLASS_IN)

639639

if cached_srv_record:

640640

self._process_record_threadsafe(zc, cached_srv_record, now)

641-

cached_txt_record = zc.cache.get_by_details(self.name, _TYPE_TXT, _CLASS_IN)

641+

cached_txt_record = zc.cache.get_by_details(self._name, _TYPE_TXT, _CLASS_IN)

642642

if cached_txt_record:

643643

self._process_record_threadsafe(zc, cached_txt_record, now)

644644

if original_server_key == self.server_key:

@@ -740,7 +740,7 @@ def generate_request_query(

740740

) -> DNSOutgoing:

741741

"""Generate the request query."""

742742

out = DNSOutgoing(_FLAGS_QR_QUERY)

743-

name = self.name

743+

name = self._name

744744

server_or_name = self.server or name

745745

cache = zc.cache

746746

out.add_question_or_one_cache(cache, now, name, _TYPE_SRV, _CLASS_IN)

@@ -754,7 +754,7 @@ def generate_request_query(

754754755755

def __eq__(self, other: object) -> bool:

756756

"""Tests equality of service name"""

757-

return isinstance(other, ServiceInfo) and other.name == self.name

757+

return isinstance(other, ServiceInfo) and other._name == self._name

758758759759

def __repr__(self) -> str:

760760

"""String representation"""