From 772c7a945c25e2134169f08b2307814bf2223377 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sun, 14 Jun 2020 15:38:43 +1000
Subject: [PATCH] fix lint issues with latest mypy_protobuf

---
 pylib/anki/collection.py | 24 ++++++++++++++----------
 pylib/anki/rsbackend.py  |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pylib/anki/collection.py b/pylib/anki/collection.py
index da65b213d..825b05eba 100644
--- a/pylib/anki/collection.py
+++ b/pylib/anki/collection.py
@@ -426,21 +426,25 @@ class Collection:
     # the reverse argument only applies when a BuiltinSortKind is provided;
     # otherwise the collection config defines whether reverse is set or not
     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]:
         if isinstance(order, str):
             mode = pb.SortOrder(custom=order)
-        elif order is True:
-            mode = pb.SortOrder(from_config=pb.Empty())
-        elif order is False:
-            mode = pb.SortOrder(none=pb.Empty())
+        elif isinstance(order, bool):
+            if order is True:
+                mode = pb.SortOrder(from_config=pb.Empty())
+            else:
+                mode = pb.SortOrder(none=pb.Empty())
         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(
-                builtin=pb.BuiltinSearchOrder(kind=kind, reverse=reverse)
+                builtin=pb.BuiltinSearchOrder(kind=order, reverse=reverse)
             )
         return self.backend.search_cards(search=query, order=mode)
 
diff --git a/pylib/anki/rsbackend.py b/pylib/anki/rsbackend.py
index 539b71d1d..047571486 100644
--- a/pylib/anki/rsbackend.py
+++ b/pylib/anki/rsbackend.py
@@ -82,12 +82,12 @@ SyncErrorKind = pb.SyncError.SyncErrorKind
 
 
 class NetworkError(StringError):
-    def kind(self) -> NetworkErrorKind:
+    def kind(self) -> pb.NetworkError.NetworkErrorKindValue:
         return self.args[1]
 
 
 class SyncError(StringError):
-    def kind(self) -> SyncErrorKind:
+    def kind(self) -> pb.SyncError.SyncErrorKindValue:
         return self.args[1]