Skip to content

Commit

Permalink
Fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
bdragon300 committed Nov 3, 2024
1 parent 4316df0 commit f24dfc2
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 45 deletions.
6 changes: 3 additions & 3 deletions pyzkaccess/aux_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
from abc import ABCMeta, abstractmethod
from typing import Any, Iterable, TypeVar, Union, overload

from .common import UserTuple
from .event import EventLog
from .sdk import ZKSDK
from pyzkaccess.common import UserTuple
from pyzkaccess.event import EventLog
from pyzkaccess.sdk import ZKSDK


class AuxInputInterface(metaclass=ABCMeta):
Expand Down
4 changes: 2 additions & 2 deletions pyzkaccess/device.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
__all__ = ["ZKModel", "ZK100", "ZK200", "ZK400", "ZKDevice"]
from typing import Any, Dict, Optional, Tuple, Type, Union

from .common import DocDict
from .enums import RelayGroup
from pyzkaccess.common import DocDict
from pyzkaccess.enums import RelayGroup


class ZKModel:
Expand Down
3 changes: 1 addition & 2 deletions pyzkaccess/device_data/queryset.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
overload,
)

from pyzkaccess.device_data.model import Field, Model
from pyzkaccess.sdk import ZKSDK

from .model import Field, Model

_ModelT = TypeVar("_ModelT", bound=Model)
_QuerySetT = TypeVar("_QuerySetT", bound="QuerySet")
RecordType = Union[Model, Mapping[str, Any]]
Expand Down
14 changes: 7 additions & 7 deletions pyzkaccess/door.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
from abc import ABCMeta, abstractmethod
from typing import Any, Iterable, TypeVar, Union, overload

from .aux_input import AuxInput, AuxInputList
from .common import UserTuple
from .event import EventLog
from .param import DoorParameters
from .reader import Reader, ReaderList
from .relay import RelayList
from .sdk import ZKSDK
from pyzkaccess.aux_input import AuxInput, AuxInputList
from pyzkaccess.common import UserTuple
from pyzkaccess.event import EventLog
from pyzkaccess.param import DoorParameters
from pyzkaccess.reader import Reader, ReaderList
from pyzkaccess.relay import RelayList
from pyzkaccess.sdk import ZKSDK


class DoorInterface(metaclass=ABCMeta):
Expand Down
2 changes: 1 addition & 1 deletion pyzkaccess/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from enum import Enum
from typing import Dict, Final

from .common import DocDict
from pyzkaccess.common import DocDict


class ControlOperation(Enum):
Expand Down
6 changes: 3 additions & 3 deletions pyzkaccess/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from datetime import datetime
from typing import Any, Iterable, Iterator, List, Optional, TypeVar, Union

from .common import DocValue, ZKDatetimeUtils
from .enums import EVENT_TYPES, PassageDirection, VerifyMode
from .sdk import ZKSDK
from pyzkaccess.common import DocValue, ZKDatetimeUtils
from pyzkaccess.enums import EVENT_TYPES, PassageDirection, VerifyMode
from pyzkaccess.sdk import ZKSDK


class Event:
Expand Down
2 changes: 1 addition & 1 deletion pyzkaccess/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from typing import Any

from .enums import PULL_SDK_ERRORS, WSA_ERROR_CODES
from pyzkaccess.enums import PULL_SDK_ERRORS, WSA_ERROR_CODES


class ZKSDKError(Exception):
Expand Down
21 changes: 10 additions & 11 deletions pyzkaccess/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@

import pyzkaccess.ctypes_ as ctypes
import pyzkaccess.sdk
from pyzkaccess.aux_input import AuxInput, AuxInputList
from pyzkaccess.device import ZK400, ZKDevice, ZKModel
from pyzkaccess.device_data.model import Model, models_registry
from pyzkaccess.device_data.queryset import QuerySet
from pyzkaccess.door import Door, DoorList
from pyzkaccess.enums import ChangeIPProtocol, ControlOperation
from pyzkaccess.event import EventLog
from pyzkaccess.exceptions import ZKSDKError

from .aux_input import AuxInput, AuxInputList
from .device import ZK400, ZKDevice, ZKModel
from .device_data.model import Model, models_registry
from .device_data.queryset import QuerySet
from .door import Door, DoorList
from .enums import ChangeIPProtocol, ControlOperation
from .event import EventLog
from .param import DeviceParameters, DoorParameters
from .reader import Reader, ReaderList
from .relay import Relay, RelayList
from pyzkaccess.param import DeviceParameters, DoorParameters
from pyzkaccess.reader import Reader, ReaderList
from pyzkaccess.relay import Relay, RelayList

_ZKAccessT = TypeVar("_ZKAccessT", bound="ZKAccess")

Expand Down
8 changes: 4 additions & 4 deletions pyzkaccess/param.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
from enum import Enum
from typing import Any, Callable, Optional, Type, TypeVar

from .common import ZKDatetimeUtils
from .device import ZKModel
from .enums import SensorType, VerifyMode
from .sdk import ZKSDK
from pyzkaccess.common import ZKDatetimeUtils
from pyzkaccess.device import ZKModel
from pyzkaccess.enums import SensorType, VerifyMode
from pyzkaccess.sdk import ZKSDK

_DaylightSavingMomentMode1T = TypeVar("_DaylightSavingMomentMode1T", bound="DaylightSavingMomentMode1")

Expand Down
6 changes: 3 additions & 3 deletions pyzkaccess/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
from abc import ABCMeta, abstractmethod
from typing import Any, Iterable, TypeVar, Union, overload

from .common import UserTuple
from .event import EventLog
from .sdk import ZKSDK
from pyzkaccess.common import UserTuple
from pyzkaccess.event import EventLog
from pyzkaccess.sdk import ZKSDK


class ReaderInterface(metaclass=ABCMeta):
Expand Down
6 changes: 3 additions & 3 deletions pyzkaccess/relay.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from abc import ABCMeta, abstractmethod
from typing import Any, Iterable, TypeVar, Union, overload

from .common import UserTuple
from .enums import ControlOperation, RelayGroup
from .sdk import ZKSDK
from pyzkaccess.common import UserTuple
from pyzkaccess.enums import ControlOperation, RelayGroup
from pyzkaccess.sdk import ZKSDK


class RelayInterface(metaclass=ABCMeta):
Expand Down
3 changes: 1 addition & 2 deletions pyzkaccess/sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
from typing import Any, Dict, Generator, List, Mapping, Optional, Sequence

import pyzkaccess.ctypes_ as ctypes

from .exceptions import ZKSDKError
from pyzkaccess.exceptions import ZKSDKError


class ZKSDK:
Expand Down
6 changes: 3 additions & 3 deletions pyzkaccess/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

from datetime import date, datetime, time

from .common import ZKDatetimeUtils
from .device_data.model import Field, Model
from .enums import (
from pyzkaccess.common import ZKDatetimeUtils
from pyzkaccess.device_data.model import Field, Model
from pyzkaccess.enums import (
EVENT_TYPES,
INOUTFUN_INPUT,
INOUTFUN_OUTPUT,
Expand Down

0 comments on commit f24dfc2

Please sign in to comment.