Revert name change of zeroconf.asyncio to zeroconf.aio (#885)

- Now that `__init__.py` no longer needs to import `asyncio`,
  the name conflict is not a concern.

Fixes #883

docs/api.rst

@@ -6,7 +6,7 @@ python-zeroconf API reference
     :undoc-members:
     :show-inheritance:
 
-.. automodule:: zeroconf.aio
+.. automodule:: zeroconf.asyncio
     :members:
     :undoc-members:
     :show-inheritance:

examples/async_apple_scanner.py

@@ -8,7 +8,7 @@
 from typing import Any, Optional, cast
 
 from zeroconf import DNSQuestionType, IPVersion, ServiceStateChange, Zeroconf
-from zeroconf.aio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf
+from zeroconf.asyncio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf
 
 HOMESHARING_SERVICE: str = "_appletv-v2._tcp.local."
 DEVICE_SERVICE: str = "_touch-able._tcp.local."

examples/async_browser.py

@@ -11,7 +11,7 @@
 from typing import Any, Optional, cast
 
 from zeroconf import IPVersion, ServiceStateChange, Zeroconf
-from zeroconf.aio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf, AsyncZeroconfServiceTypes
+from zeroconf.asyncio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf, AsyncZeroconfServiceTypes
 
 
 def async_on_service_state_change(

examples/async_registration.py

@@ -9,7 +9,7 @@
 from typing import List
 
 from zeroconf import IPVersion
-from zeroconf.aio import AsyncServiceInfo, AsyncZeroconf
+from zeroconf.asyncio import AsyncServiceInfo, AsyncZeroconf
 
 
 async def register_services(infos: List[AsyncServiceInfo]) -> None:

examples/async_service_info_request.py

@@ -13,7 +13,7 @@
 
 
 from zeroconf import IPVersion, ServiceBrowser, ServiceStateChange, Zeroconf
-from zeroconf.aio import AsyncServiceInfo, AsyncZeroconf
+from zeroconf.asyncio import AsyncServiceInfo, AsyncZeroconf
 
 
 HAP_TYPE = "_hap._tcp.local."

tests/services/test_browser.py

@@ -22,7 +22,7 @@
 from zeroconf._services import ServiceStateChange
 from zeroconf._services.browser import ServiceBrowser
 from zeroconf._services.info import ServiceInfo
-from zeroconf.aio import AsyncZeroconf
+from zeroconf.asyncio import AsyncZeroconf
 
 from .. import has_working_ipv6, _inject_response, _wait_for_start
 

tests/services/test_info.py

@@ -18,7 +18,7 @@
 import zeroconf as r
 from zeroconf import DNSAddress, const
 from zeroconf._services.info import ServiceInfo
-from zeroconf.aio import AsyncZeroconf
+from zeroconf.asyncio import AsyncZeroconf
 
 from .. import has_working_ipv6, _inject_response
 

tests/test_aio.py → tests/test_asyncio.py

@@ -14,7 +14,7 @@
 
 import pytest
 
-from zeroconf.aio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf, AsyncZeroconfServiceTypes
+from zeroconf.asyncio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf, AsyncZeroconfServiceTypes
 from zeroconf import (
     DNSIncoming,
     DNSOutgoing,
@@ -422,7 +422,7 @@ async def test_service_info_async_request() -> None:
     _clear_cache(aiozc.zeroconf)
     # Generating the race condition is almost impossible
     # without patching since its a TOCTOU race
-    with patch("zeroconf.aio.AsyncServiceInfo._is_complete", False):
+    with patch("zeroconf.asyncio.AsyncServiceInfo._is_complete", False):
         await aiosinfo.async_request(aiozc.zeroconf, 3000)
     assert aiosinfo is not None
     assert aiosinfo.addresses == [socket.inet_aton("10.0.1.3")]
@@ -826,7 +826,7 @@ def send(out, addr=const._MDNS_ADDR, port=const._MDNS_PORT):
     with patch.object(zeroconf_info, "async_send", send):
         aiosinfo = AsyncServiceInfo(type_, registration_name)
         # Patch _is_complete so we send multiple times
-        with patch("zeroconf.aio.AsyncServiceInfo._is_complete", False):
+        with patch("zeroconf.asyncio.AsyncServiceInfo._is_complete", False):
             await aiosinfo.async_request(aiozc.zeroconf, 1200)
         try:
             assert first_outgoing.questions[0].unicast == True

tests/test_core.py

@@ -20,7 +20,7 @@
 
 import zeroconf as r
 from zeroconf import _core, _protocol, const, Zeroconf, current_time_millis
-from zeroconf.aio import AsyncZeroconf
+from zeroconf.asyncio import AsyncZeroconf
 
 from . import has_working_ipv6, _clear_cache, _inject_response, _wait_for_start
 

tests/test_handlers.py

@@ -17,7 +17,7 @@
 from zeroconf import ServiceInfo, Zeroconf, current_time_millis
 from zeroconf import const
 from zeroconf._dns import DNSRRSet
-from zeroconf.aio import AsyncZeroconf
+from zeroconf.asyncio import AsyncZeroconf
 
 
 from . import _clear_cache, _inject_response

tests/utils/test_aio.py → tests/utils/test_asyncio.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
-"""Unit tests for zeroconf._utils.aio."""
+"""Unit tests for zeroconf._utils.asyncio."""
 
 import asyncio
 import contextlib
@@ -12,7 +12,7 @@
 
 import pytest
 
-from zeroconf._utils import aio as aioutils
+from zeroconf._utils import asyncio as aioutils
 
 
 @pytest.mark.asyncio
@@ -25,7 +25,7 @@ async def test_async_get_all_tasks() -> None:
     await aioutils._async_get_all_tasks(aioutils.get_running_loop())
     if not hasattr(asyncio, 'all_tasks'):
         return
-    with patch("zeroconf._utils.aio.asyncio.all_tasks", side_effect=RuntimeError):
+    with patch("zeroconf._utils.asyncio.asyncio.all_tasks", side_effect=RuntimeError):
         await aioutils._async_get_all_tasks(aioutils.get_running_loop())
 
 

zeroconf/_core.py

@@ -43,7 +43,7 @@
 from ._services.info import ServiceInfo, instance_name_from_service_info
 from ._services.registry import ServiceRegistry
 from ._updates import RecordUpdate, RecordUpdateListener
-from ._utils.aio import get_running_loop, shutdown_loop, wait_event_or_timeout
+from ._utils.asyncio import get_running_loop, shutdown_loop, wait_event_or_timeout
 from ._utils.name import service_type_name
 from ._utils.net import (
     IPVersion,

zeroconf/_services/browser.py

@@ -38,7 +38,7 @@
     SignalRegistrationInterface,
 )
 from .._updates import RecordUpdate, RecordUpdateListener
-from .._utils.aio import get_best_available_queue
+from .._utils.asyncio import get_best_available_queue
 from .._utils.name import service_type_name
 from .._utils.time import current_time_millis, millis_to_seconds
 from ..const import (

zeroconf/_services/info.py

@@ -29,7 +29,7 @@
 from .._exceptions import BadTypeInNameException
 from .._protocol import DNSOutgoing
 from .._updates import RecordUpdate, RecordUpdateListener
-from .._utils.aio import get_running_loop
+from .._utils.asyncio import get_running_loop
 from .._utils.name import service_type_name
 from .._utils.net import (
     IPVersion,