Skip to content

Relocate ServiceInfo to zeroconf._services.info #741

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 6 commits into from
Jun 19, 2021
Merged

Relocate ServiceInfo to zeroconf._services.info #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10281d7
Relocate ServiceInfo to zeroconf._services.info
bdraco Jun 19, 2021
7dfa016
save
bdraco Jun 19, 2021
0e903d1
fixes
bdraco Jun 19, 2021
34fe221
missed one
bdraco Jun 19, 2021
b72ed5c
Update test case
bdraco Jun 19, 2021
f3f1e62
Merge remote-tracking branch 'upstream/master' into service_info_brea…
bdraco Jun 19, 2021
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
3 changes: 2 additions & 1 deletion tests/test_aio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
from zeroconf import Zeroconf
from zeroconf.const import _LISTENER_TIME
from zeroconf._exceptions import BadTypeInNameException, NonUniqueNameException, ServiceNameAlreadyRegistered
from zeroconf._services import ServiceInfo, ServiceListener
from zeroconf._services import ServiceListener
from zeroconf._services.info import ServiceInfo
from zeroconf._utils.time import current_time_millis

from . import _clear_cache
Expand Down
7 changes: 2 additions & 5 deletions tests/test_services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
from zeroconf import DNSAddress, DNSPointer, DNSQuestion, const, current_time_millis
import zeroconf._services as s
from zeroconf import Zeroconf
from zeroconf._services import (
ServiceBrowser,
ServiceInfo,
ServiceStateChange,
)
from zeroconf._services import ServiceBrowser, ServiceStateChange
from zeroconf._services.info import ServiceInfo
from zeroconf.aio import AsyncZeroconf

from . import has_working_ipv6, _clear_cache, _inject_response
Expand Down
6 changes: 4 additions & 2 deletions zeroconf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,17 @@
)
from ._protocol import DNSIncoming, DNSOutgoing # noqa # import needed for backwards compat
from ._services import ( # noqa # import needed for backwards compat
instance_name_from_service_info,
Signal,
SignalRegistrationInterface,
RecordUpdateListener,
ServiceBrowser,
ServiceInfo,
ServiceListener,
ServiceStateChange,
)
from ._services.info import ( # noqa # import needed for backwards compat
instance_name_from_service_info,
ServiceInfo,
)
from ._services.registry import ServiceRegistry # noqa # import needed for backwards compat
from ._services.types import ZeroconfServiceTypes
from ._utils.name import service_type_name # noqa # import needed for backwards compat
Expand Down
9 changes: 2 additions & 7 deletions zeroconf/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,8 @@
from ._handlers import QueryHandler, RecordManager
from ._logger import QuietLogger, log
from ._protocol import DNSIncoming, DNSOutgoing
from ._services import (
RecordUpdateListener,
ServiceBrowser,
ServiceInfo,
ServiceListener,
instance_name_from_service_info,
)
from ._services import RecordUpdateListener, ServiceBrowser, ServiceListener
from ._services.info import ServiceInfo, instance_name_from_service_info
from ._services.registry import ServiceRegistry
from ._utils.aio import get_running_loop
from ._utils.name import service_type_name
Expand Down
Loading