GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix lint issues with latest mypy_protobuf

Browse source
This commit is contained in:
Damien Elmes 2020-06-14 15:38:43 +10:00
parent 263bfb2e8e
commit 772c7a945c
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pylib/anki/collection.py
View file

@ -426,21 +426,25 @@ class Collection:
# the reverse argument only applies when a BuiltinSortKind is provided; # the reverse argument only applies when a BuiltinSortKind is provided;
# otherwise the collection config defines whether reverse is set or not # otherwise the collection config defines whether reverse is set or not
def find_cards( def find_cards(
self, query: str, order: Union[bool, str, int] = False, reverse: bool = False, self,
query: str,
order: Union[
bool,
str,
pb.BuiltinSearchOrder.BuiltinSortKindValue, # pylint: disable=no-member
] = False,
reverse: bool = False,
) -> Sequence[int]: ) -> Sequence[int]:
if isinstance(order, str): if isinstance(order, str):
mode = pb.SortOrder(custom=order) mode = pb.SortOrder(custom=order)
elif order is True: elif isinstance(order, bool):
if order is True:
mode = pb.SortOrder(from_config=pb.Empty()) mode = pb.SortOrder(from_config=pb.Empty())
elif order is False: else:
mode = pb.SortOrder(none=pb.Empty()) mode = pb.SortOrder(none=pb.Empty())
else: else:
# sadly we can't use the protobuf type in a Union, so we
# have to accept an int and convert it
BKind = pb.BuiltinSearchOrder.BuiltinSortKind # pylint: disable=no-member
kind = BKind.Value(BKind.Name(order))
mode = pb.SortOrder( mode = pb.SortOrder(
builtin=pb.BuiltinSearchOrder(kind=kind, reverse=reverse) builtin=pb.BuiltinSearchOrder(kind=order, reverse=reverse)
) )
return self.backend.search_cards(search=query, order=mode) return self.backend.search_cards(search=query, order=mode)

4
pylib/anki/rsbackend.py
View file

@ -82,12 +82,12 @@ SyncErrorKind = pb.SyncError.SyncErrorKind
class NetworkError(StringError): class NetworkError(StringError):
def kind(self) -> NetworkErrorKind: def kind(self) -> pb.NetworkError.NetworkErrorKindValue:
return self.args[1] return self.args[1]
class SyncError(StringError): class SyncError(StringError):
def kind(self) -> SyncErrorKind: def kind(self) -> pb.SyncError.SyncErrorKindValue:
return self.args[1] return self.args[1]