Use pydantic.v1 namespace on all pydantic versions (#883)

With https://github.com/pydantic/pydantic/pull/9042 being shipped with
[1.10.15](https://docs.pydantic.dev/latest/changelog/#v11015-2024-04-03),
we can clean up the imports a bit until we make decisions how to move
onward with or without pydantic.

---------

Co-authored-by: Steven B. <51370195+sdb9696@users.noreply.github.com>
This commit is contained in:
Teemu R
2024-05-01 15:59:35 +02:00
committed by GitHub
parent 16f17a7729
commit 46338ee21d
9 changed files with 252 additions and 285 deletions

View File

@@ -5,10 +5,7 @@ from __future__ import annotations
from abc import ABC, abstractmethod
from typing import NamedTuple, Optional
try:
from pydantic.v1 import BaseModel
except ImportError:
from pydantic import BaseModel
from pydantic.v1 import BaseModel
class ColorTempRange(NamedTuple):

View File

@@ -14,6 +14,7 @@ from pprint import pformat as pf
from typing import Any, cast
import asyncclick as click
from pydantic.v1 import ValidationError
from kasa import (
AuthenticationError,
@@ -42,11 +43,6 @@ from kasa.iot import (
from kasa.iot.modules import Usage
from kasa.smart import SmartDevice
try:
from pydantic.v1 import ValidationError
except ImportError:
from pydantic import ValidationError
try:
from rich import print as _do_echo
except ImportError:

View File

@@ -12,11 +12,7 @@ from typing import Awaitable, Callable, Dict, Optional, Type, cast
# When support for cpython older than 3.11 is dropped
# async_timeout can be replaced with asyncio.timeout
from async_timeout import timeout as asyncio_timeout
try:
from pydantic.v1 import BaseModel, ValidationError # pragma: no cover
except ImportError:
from pydantic import BaseModel, ValidationError # pragma: no cover
from pydantic.v1 import BaseModel, ValidationError
from kasa import Device
from kasa.credentials import Credentials

View File

@@ -7,10 +7,7 @@ import re
from enum import Enum
from typing import Optional, cast
try:
from pydantic.v1 import BaseModel, Field, root_validator
except ImportError:
from pydantic import BaseModel, Field, root_validator
from pydantic.v1 import BaseModel, Field, root_validator
from ..bulb import HSV, Bulb, BulbPreset, ColorTempRange
from ..device_type import DeviceType

View File

@@ -1,9 +1,6 @@
"""Cloud module implementation."""
try:
from pydantic.v1 import BaseModel
except ImportError:
from pydantic import BaseModel
from pydantic.v1 import BaseModel
from ...feature import Feature
from ..iotmodule import IotModule

View File

@@ -6,11 +6,7 @@ import logging
from enum import Enum
from typing import Dict, List, Optional
try:
from pydantic.v1 import BaseModel
except ImportError:
from pydantic import BaseModel
from pydantic.v1 import BaseModel
from ..iotmodule import IotModule, merge

View File

@@ -2,18 +2,15 @@
from __future__ import annotations
from datetime import date
from typing import TYPE_CHECKING, Any, Optional
from pydantic.v1 import BaseModel, Field, validator
from ...exceptions import SmartErrorCode
from ...feature import Feature
from ..smartmodule import SmartModule
try:
from pydantic.v1 import BaseModel, Field, validator
except ImportError:
from pydantic import BaseModel, Field, validator
from datetime import date
if TYPE_CHECKING:
from ..smartdevice import SmartDevice