mirror of
https://github.com/python-kasa/python-kasa.git
synced 2025-08-09 20:24:02 +00:00
Move protocol modules into protocols package (#1254)
This commit is contained in:
@@ -2,7 +2,7 @@ import copy
|
||||
import logging
|
||||
|
||||
from kasa.deviceconfig import DeviceConfig
|
||||
from kasa.iotprotocol import IotProtocol
|
||||
from kasa.protocols import IotProtocol
|
||||
from kasa.transports.basetransport import BaseTransport
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
@@ -7,9 +7,9 @@ from freezegun.api import FrozenDateTimeFactory
|
||||
|
||||
from kasa import Device
|
||||
from kasa.device_type import DeviceType
|
||||
from kasa.protocols.smartprotocol import _ChildProtocolWrapper
|
||||
from kasa.smart.smartchilddevice import SmartChildDevice
|
||||
from kasa.smart.smartdevice import NON_HUB_PARENT_ONLY_MODULES
|
||||
from kasa.smartprotocol import _ChildProtocolWrapper
|
||||
|
||||
from .conftest import (
|
||||
parametrize,
|
||||
|
@@ -9,7 +9,7 @@ import aiohttp
|
||||
import pytest
|
||||
from yarl import URL
|
||||
|
||||
from kasa.credentials import Credentials
|
||||
from kasa.credentials import DEFAULT_CREDENTIALS, Credentials, get_default_credentials
|
||||
from kasa.deviceconfig import DeviceConfig
|
||||
from kasa.exceptions import (
|
||||
AuthenticationError,
|
||||
@@ -19,9 +19,7 @@ from kasa.exceptions import (
|
||||
_RetryableError,
|
||||
)
|
||||
from kasa.httpclient import HttpClient
|
||||
from kasa.iotprotocol import IotProtocol
|
||||
from kasa.protocol import DEFAULT_CREDENTIALS, get_default_credentials
|
||||
from kasa.smartprotocol import SmartProtocol
|
||||
from kasa.protocols import IotProtocol, SmartProtocol
|
||||
from kasa.transports.aestransport import AesTransport
|
||||
from kasa.transports.klaptransport import (
|
||||
KlapEncryptionSession,
|
||||
|
@@ -18,8 +18,8 @@ from kasa.device import Device
|
||||
from kasa.deviceconfig import DeviceConfig
|
||||
from kasa.exceptions import KasaException
|
||||
from kasa.iot import IotDevice
|
||||
from kasa.iotprotocol import IotProtocol, _deprecated_TPLinkSmartHomeProtocol
|
||||
from kasa.protocol import (
|
||||
from kasa.protocols.iotprotocol import IotProtocol, _deprecated_TPLinkSmartHomeProtocol
|
||||
from kasa.protocols.protocol import (
|
||||
BaseProtocol,
|
||||
mask_mac,
|
||||
redact_data,
|
||||
|
@@ -13,10 +13,10 @@ from pytest_mock import MockerFixture
|
||||
|
||||
from kasa import Device, KasaException, Module
|
||||
from kasa.exceptions import DeviceError, SmartErrorCode
|
||||
from kasa.protocols.smartprotocol import _ChildProtocolWrapper
|
||||
from kasa.smart import SmartDevice
|
||||
from kasa.smart.modules.energy import Energy
|
||||
from kasa.smart.smartmodule import SmartModule
|
||||
from kasa.smartprotocol import _ChildProtocolWrapper
|
||||
|
||||
from .conftest import (
|
||||
device_smart,
|
||||
@@ -266,7 +266,9 @@ async def test_update_module_query_errors(
|
||||
|
||||
mocker.patch.object(new_dev.protocol, "query", side_effect=_query)
|
||||
# children not created yet so cannot patch.object
|
||||
mocker.patch("kasa.smartprotocol._ChildProtocolWrapper.query", new=_child_query)
|
||||
mocker.patch(
|
||||
"kasa.protocols.smartprotocol._ChildProtocolWrapper.query", new=_child_query
|
||||
)
|
||||
|
||||
await new_dev.update()
|
||||
|
||||
@@ -297,7 +299,7 @@ async def test_update_module_query_errors(
|
||||
new_dev.protocol, "query", side_effect=new_dev.protocol._query
|
||||
)
|
||||
mocker.patch(
|
||||
"kasa.smartprotocol._ChildProtocolWrapper.query",
|
||||
"kasa.protocols.smartprotocol._ChildProtocolWrapper.query",
|
||||
new=_ChildProtocolWrapper._query,
|
||||
)
|
||||
|
||||
|
@@ -9,8 +9,8 @@ from kasa.exceptions import (
|
||||
KasaException,
|
||||
SmartErrorCode,
|
||||
)
|
||||
from kasa.protocols.smartprotocol import SmartProtocol, _ChildProtocolWrapper
|
||||
from kasa.smart import SmartDevice
|
||||
from kasa.smartprotocol import SmartProtocol, _ChildProtocolWrapper
|
||||
|
||||
from .conftest import device_smart
|
||||
from .fakeprotocol_smart import FakeSmartTransport
|
||||
|
@@ -11,7 +11,7 @@ import aiohttp
|
||||
import pytest
|
||||
from yarl import URL
|
||||
|
||||
from kasa.credentials import Credentials
|
||||
from kasa.credentials import DEFAULT_CREDENTIALS, Credentials, get_default_credentials
|
||||
from kasa.deviceconfig import DeviceConfig
|
||||
from kasa.exceptions import (
|
||||
AuthenticationError,
|
||||
@@ -24,7 +24,6 @@ from kasa.experimental.sslaestransport import (
|
||||
_sha256_hash,
|
||||
)
|
||||
from kasa.httpclient import HttpClient
|
||||
from kasa.protocol import DEFAULT_CREDENTIALS, get_default_credentials
|
||||
from kasa.transports.aestransport import AesEncyptionSession
|
||||
|
||||
# Transport tests are not designed for real devices
|
||||
|
Reference in New Issue
Block a user