fix: MyPy type checking errors and update Mypy version

mukund-ananthu · mukund-ananthu · commit 45a7397ed4b5 · 2024-06-07T15:01:46.000Z
diff --git a/google/cloud/pubsub_v1/publisher/_batch/thread.py b/google/cloud/pubsub_v1/publisher/_batch/thread.py
@@ -90,7 +90,7 @@ def __init__(
         client: "PublisherClient",
         topic: str,
         settings: "types.BatchSettings",
-        batch_done_callback: Callable[[bool], Any] = None,
+        batch_done_callback: Optional[Callable[[bool], Any]] = None,
         commit_when_full: bool = True,
         commit_retry: "OptionalRetry" = gapic_v1.method.DEFAULT,
         commit_timeout: "types.OptionalTimeout" = gapic_v1.method.DEFAULT,
diff --git a/google/cloud/pubsub_v1/publisher/futures.py b/google/cloud/pubsub_v1/publisher/futures.py
@@ -45,7 +45,7 @@ def cancelled(self) -> bool:
         """
         return False
 
-    def result(self, timeout: Union[int, float] = None) -> str:
+    def result(self, timeout: Union[int, float, None] = None) -> str:
         """Return the message ID or raise an exception.
 
         This blocks until the message has been published successfully and
diff --git a/google/cloud/pubsub_v1/subscriber/_protocol/helper_threads.py b/google/cloud/pubsub_v1/subscriber/_protocol/helper_threads.py
@@ -15,7 +15,7 @@
 import logging
 import queue
 import time
-from typing import Any, Callable, List, Sequence
+from typing import Any, Callable, List, Sequence, Optional
 import uuid
 
 
@@ -32,7 +32,7 @@
 
 
 def _get_many(
-    queue_: queue.Queue, max_items: int = None, max_latency: float = 0
+    queue_: queue.Queue, max_items: Optional[int] = None, max_latency: float = 0
 ) -> List[Any]:
     """Get multiple items from a Queue.
 
diff --git a/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py b/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py
@@ -267,7 +267,7 @@ def __init__(
         client: "subscriber.Client",
         subscription: str,
         flow_control: types.FlowControl = types.FlowControl(),
-        scheduler: ThreadScheduler = None,
+        scheduler: Optional[ThreadScheduler] = None,
         use_legacy_flow_control: bool = False,
         await_callbacks_on_shutdown: bool = False,
     ):
diff --git a/google/cloud/pubsub_v1/subscriber/futures.py b/google/cloud/pubsub_v1/subscriber/futures.py
@@ -104,7 +104,7 @@ def cancelled(self) -> bool:
         """
         return False
 
-    def result(self, timeout: Union[int, float] = None) -> AcknowledgeStatus:
+    def result(self, timeout: Union[int, float, None] = None) -> AcknowledgeStatus:
         """Return a success code or raise an exception.
 
         This blocks until the operation completes successfully and
diff --git a/google/cloud/pubsub_v1/subscriber/scheduler.py b/google/cloud/pubsub_v1/subscriber/scheduler.py
@@ -162,7 +162,7 @@ def shutdown(
                 work_item = self._executor._work_queue.get(block=False)
                 if work_item is None:  # Exceutor in shutdown mode.
                     continue
-                dropped_messages.append(work_item.args[0])
+                dropped_messages.append(work_item.args[0])  #type: ignore[index]
         except queue.Empty:
             pass
 
