Skip to content

Commit b1ad4b3

Browse files
committed
fixed style issues
1 parent acd6546 commit b1ad4b3

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

google/api_core/retry_streaming.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ def _handle_exception(self, exc) -> None:
105105
time.sleep(next_sleep)
106106
self.active_target = self.target_fn().__iter__()
107107

108-
def _check_timeout(self, current_time:float, source_exception: Optional[Exception] = None) -> None:
108+
def _check_timeout(
109+
self, current_time: float, source_exception: Optional[Exception] = None
110+
) -> None:
109111
"""
110112
Helper function to check if the timeout has been exceeded, and raise a RetryError if so.
111113
@@ -115,7 +117,11 @@ def _check_timeout(self, current_time:float, source_exception: Optional[Exceptio
115117
Raises:
116118
- RetryError if the deadline has been exceeded
117119
"""
118-
if self.deadline is not None and self.deadline < current_time:
120+
if (
121+
self.deadline is not None
122+
and self.timeout is not None
123+
and self.deadline < current_time
124+
):
119125
raise exceptions.RetryError(
120126
"Timeout of {:.1f}s exceeded".format(self.timeout),
121127
source_exception,

tests/asyncio/test_retry_async.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,4 +776,3 @@ async def test_iterate_stream_after_deadline(self):
776776
await generator.__anext__()
777777
with pytest.raises(exceptions.RetryError):
778778
await generator.asend("test")
779-

tests/unit/test_retry.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ def test_with_delay_partial_options(self):
304304
assert retry_ is not new_retry
305305
assert new_retry._initial == 1
306306
assert new_retry._maximum == 4
307-
assert n ew_retry._multiplier == 3
307+
assert new_retry._multiplier == 3
308308

309309
new_retry = retry_.with_delay(multiplier=4)
310310
assert retry_ is not new_retry
@@ -774,6 +774,7 @@ def test_iterate_stream_after_deadline(self):
774774
Streaming retries should raise RetryError when calling next after deadline has passed
775775
"""
776776
from time import sleep
777+
777778
retry_ = retry.Retry(
778779
predicate=retry.if_exception_type(ValueError),
779780
is_stream=True,
@@ -791,6 +792,7 @@ def test_iterate_stream_send_after_deadline(self):
791792
Streaming retries should raise RetryError when calling send after deadline has passed
792793
"""
793794
from time import sleep
795+
794796
retry_ = retry.Retry(
795797
predicate=retry.if_exception_type(ValueError),
796798
is_stream=True,
@@ -803,4 +805,3 @@ def test_iterate_stream_send_after_deadline(self):
803805
sleep(0.02)
804806
with pytest.raises(exceptions.RetryError):
805807
generator.send("test")
806-
 

0 commit comments

Comments
 (0)