fixed mypy issues

Author: daniel-sanche

google/api_core/retry_streaming.py

@@ -58,7 +58,7 @@ def __init__(
                 be caught.
         """
         self.target_fn = target
-        self.active_target: Iterator = self.target_fn().__iter__()
+        self.active_target: Iterator[T] = self.target_fn().__iter__()
         self.predicate = predicate
         self.sleep_generator = iter(sleep_generator)
         self.on_error = on_error
@@ -106,7 +106,7 @@ def _handle_exception(self, exc) -> None:
                 "Retrying due to {}, sleeping {:.1f}s ...".format(exc, next_sleep)
             )
             time.sleep(next_sleep)
-            self.active_target = self.target_fn()
+            self.active_target = self.target_fn().__iter__()
 
     def __next__(self) -> T:
         """
@@ -130,7 +130,8 @@ def close(self) -> None:
           - AttributeError if the active_target does not have a close() method
         """
         if getattr(self.active_target, "close", None):
-            return self.active_target.close()
+            casted_target = cast(Generator, self.active_target)
+            return casted_target.close()
         else:
             raise AttributeError(
                 "close() not implemented for {}".format(self.active_target)

google/api_core/retry_streaming_async.py

@@ -23,13 +23,11 @@
     AsyncIterable,
     Awaitable,
     Union,
-    Any,
     TypeVar,
     AsyncGenerator,
 )
 
 import asyncio
-import inspect
 import logging
 import datetime
 
@@ -118,7 +116,7 @@ async def _handle_exception(self, exc) -> None:
             except StopIteration:
                 raise ValueError("Sleep generator stopped yielding sleep values")
             # if time budget is exceeded, raise RetryError
-            if self.remaining_timeout_budget is not None:
+            if self.remaining_timeout_budget is not None and self.timeout is not None:
                 if self.remaining_timeout_budget <= next_sleep:
                     raise exceptions.RetryError(
                         "Timeout of {:.1f}s exceeded".format(self.timeout),