reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove no longer needed tenacity workarounds

Browse source 
Now that we have packaged tenacity 6.2 for debian buster and use it
in production, we can remove the workarounds to support tenacity < 5.
This commit is contained in:
Antoine Lambert 2021-12-08 11:39:17 +01:00
parent fa7ecc8fbd
commit 445d539b3f
5 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
swh/lister/utils.py
View file

@ -55,24 +55,11 @@ def is_retryable_exception(e: Exception) -> bool:
return is_connection_error or is_throttling_exception(e) or is_500_error
def retry_attempt(retry_state):
"""
Utility function to get last retry attempt info based on the
tenacity version (as debian buster packages version 4.12).
"""
try:
attempt = retry_state.outcome
except AttributeError:
# tenacity < 5.0
attempt = retry_state
return attempt
def retry_if_exception(retry_state, predicate: Callable[[Exception], bool]) -> bool:
"""
Custom tenacity retry predicate for handling exceptions with the given predicate.
"""
attempt = retry_attempt(retry_state)
attempt = retry_state.outcome
if attempt.failed:
exception = attempt.exception()
return predicate(exception)