diff --git a/pyzkaccess/cli.py b/pyzkaccess/cli.py index 3e91cb3..7ed981f 100644 --- a/pyzkaccess/cli.py +++ b/pyzkaccess/cli.py @@ -24,7 +24,8 @@ Tuple, Type, TypeVar, - Union, ) + Union +) import fire import prettytable diff --git a/pyzkaccess/common.py b/pyzkaccess/common.py index 8ded69c..5c7af38 100644 --- a/pyzkaccess/common.py +++ b/pyzkaccess/common.py @@ -176,7 +176,7 @@ def __deepcopy__(self: _DocValueT, memodict: Optional[dict] = None) -> _DocValue return obj def __reduce__(self: _DocValueT) -> Tuple[Type[_DocValueT], Tuple[_DocValueValueT, str]]: - return self.__class__, (self._self_value, self._self_doc) + return type(self), (self._self_value, self._self_doc) def __reduce_ex__(self: _DocValueT, _: Any) -> Tuple[Type[_DocValueT], Tuple[_DocValueValueT, str]]: return self.__reduce__() diff --git a/pyzkaccess/event.py b/pyzkaccess/event.py index c4de474..8cafdac 100644 --- a/pyzkaccess/event.py +++ b/pyzkaccess/event.py @@ -38,7 +38,7 @@ def __init__(self, s: str): def description(self) -> str: msg = ( f'Event[{self.time}]: "{self.event_type.doc}" at door "{self.door}" for card "{self.card}" -- ' - f"{self.entry_exit.name.capitalize()}" + f"{self.entry_exit.name.capitalize()}]" ) return msg @@ -70,7 +70,7 @@ def __ne__(self, other: Any) -> bool: return not self.__eq__(other) def __str__(self) -> str: - return f"Event({', '.join([f'{k}={getattr(self, k)}' for k in self.__slots__])}" + return f"Event({', '.join([f'{k}={getattr(self, k)}' for k in self.__slots__])})" def __repr__(self) -> str: return self.__str__()