Mark zeroconf.dns as protected by renaming to zeroconf._dns (#574)

bdraco · web-flow · commit 0e61b1502c7f · 2021-06-13T01:30:23.000-10:00
- The public API should only access zeroconf and zeroconf.aio
  as internals may be relocated between releases
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -28,7 +28,7 @@
 
 
 from zeroconf.core import Zeroconf
-from zeroconf.dns import DNSIncoming
+from zeroconf._dns import DNSIncoming
 
 
 def _inject_response(zc: Zeroconf, msg: DNSIncoming) -> None:
diff --git a/zeroconf/__init__.py b/zeroconf/__init__.py
@@ -24,7 +24,7 @@
 
 from .cache import DNSCache  # noqa # import needed for backwards compat
 from .core import NotifyListener, Zeroconf  # noqa # import needed for backwards compat
-from .dns import (  # noqa # import needed for backwards compat
+from ._dns import (  # noqa # import needed for backwards compat
     DNSAddress,
     DNSEntry,
     DNSHinfo,
diff --git a/zeroconf/_dns.py b/zeroconf/_dns.py
diff --git a/zeroconf/aio.py b/zeroconf/aio.py
@@ -26,9 +26,9 @@
 from types import TracebackType  # noqa # used in type hints
 from typing import Awaitable, Callable, Dict, List, Optional, Type, Union
 
+from ._dns import DNSOutgoing
 from .const import _BROWSER_TIME, _CHECK_TIME, _LISTENER_TIME, _MDNS_PORT, _REGISTER_TIME, _UNREGISTER_TIME
 from .core import NotifyListener, Zeroconf
-from .dns import DNSOutgoing
 from .exceptions import NonUniqueNameException
 from .services import ServiceInfo, _ServiceBrowserBase, instance_name_from_service_info
 from .utils.aio import wait_condition_or_timeout
diff --git a/zeroconf/cache.py b/zeroconf/cache.py
@@ -22,8 +22,8 @@
 
 from typing import Dict, Iterable, List, Optional, cast
 
+from ._dns import DNSEntry, DNSPointer, DNSRecord, DNSService
 from .const import _TYPE_PTR
-from .dns import DNSEntry, DNSPointer, DNSRecord, DNSService
 from .utils.time import current_time_millis
 
 
diff --git a/zeroconf/core.py b/zeroconf/core.py
@@ -28,6 +28,7 @@
 from types import TracebackType  # noqa # used in type hints
 from typing import Dict, List, Optional, Type, Union, cast
 
+from ._dns import DNSIncoming, DNSOutgoing, DNSQuestion
 from .cache import DNSCache
 from .const import (
     _CACHE_CLEANUP_INTERVAL,
@@ -45,7 +46,6 @@
     _TYPE_PTR,
     _UNREGISTER_TIME,
 )
-from .dns import DNSIncoming, DNSOutgoing, DNSQuestion
 from .exceptions import NonUniqueNameException
 from .handlers import QueryHandler, RecordManager
 from .logger import QuietLogger, log
diff --git a/zeroconf/handlers.py b/zeroconf/handlers.py
@@ -23,6 +23,7 @@
 import itertools
 from typing import List, Optional, TYPE_CHECKING, Union
 
+from ._dns import DNSAddress, DNSIncoming, DNSOutgoing, DNSPointer, DNSQuestion, DNSRecord
 from .const import (
     _CLASS_IN,
     _DNS_OTHER_TTL,
@@ -35,7 +36,6 @@
     _TYPE_SRV,
     _TYPE_TXT,
 )
-from .dns import DNSAddress, DNSIncoming, DNSOutgoing, DNSPointer, DNSQuestion, DNSRecord
 from .logger import log
 from .services import (
     RecordUpdateListener,
diff --git a/zeroconf/services/__init__.py b/zeroconf/services/__init__.py
@@ -27,6 +27,7 @@
 from collections import OrderedDict
 from typing import Any, Callable, Dict, List, Optional, Set, TYPE_CHECKING, Tuple, Union, cast
 
+from .._dns import DNSAddress, DNSOutgoing, DNSPointer, DNSQuestion, DNSRecord, DNSService, DNSText
 from ..const import (
     _BROWSER_BACKOFF_LIMIT,
     _BROWSER_TIME,
@@ -46,7 +47,6 @@
     _TYPE_SRV,
     _TYPE_TXT,
 )
-from ..dns import DNSAddress, DNSOutgoing, DNSPointer, DNSQuestion, DNSRecord, DNSService, DNSText
 from ..exceptions import BadTypeInNameException
 from ..utils.name import service_type_name
 from ..utils.net import (
