Skip to content

Simplify omit http_client in DeviceConfig serialization #1292

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.

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
merged 1 commit into from
Nov 21, 2024
Merged
Changes from all commits
Commits
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
18 changes: 3 additions & 15 deletions kasa/deviceconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@
import logging
from dataclasses import dataclass, field, replace
from enum import Enum
from typing import TYPE_CHECKING, Any, Self, TypedDict
from typing import TYPE_CHECKING, TypedDict

from aiohttp import ClientSession
from mashumaro import field_options
from mashumaro import field_options, pass_through
from mashumaro.config import BaseConfig
from mashumaro.types import SerializationStrategy

from .credentials import Credentials
from .exceptions import KasaException
Expand Down Expand Up @@ -122,14 +121,6 @@ def from_values(
) from ex


class _DoNotSerialize(SerializationStrategy):
def serialize(self, value: Any) -> None:
return None # pragma: no cover

def deserialize(self, value: Any) -> None:
return None # pragma: no cover


@dataclass
class DeviceConfig(_DeviceConfigBaseMixin):
"""Class to represent paramaters that determine how to connect to devices."""
Expand Down Expand Up @@ -163,7 +154,7 @@ class DeviceConfig(_DeviceConfigBaseMixin):
http_client: ClientSession | None = field(
default=None,
compare=False,
metadata=field_options(serialization_strategy=_DoNotSerialize()),
metadata=field_options(serialize="omit", deserialize=pass_through),
)

aes_keys: KeyPairDict | None = None
Expand All @@ -174,9 +165,6 @@ def __post_init__(self) -> None:
DeviceFamily.IotSmartPlugSwitch, DeviceEncryptionType.Xor
)

def __pre_serialize__(self) -> Self:
return replace(self, http_client=None)

def to_dict_control_credentials(
self,
*,
Expand Down
Loading