From 170a719cc8f779dd20a6624e488e81b074c1f141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl> Date: Tue, 15 Jun 2021 22:00:26 +0200 Subject: [PATCH] v2.17.10 --- satella/__init__.py | 2 +- satella/time/measure.py | 6 +++++- satella/time/misc.py | 12 +++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/satella/__init__.py b/satella/__init__.py index a84afa18..246e4ec4 100644 --- a/satella/__init__.py +++ b/satella/__init__.py @@ -1 +1 @@ -__version__ = '2.17.10a1' +__version__ = '2.17.10' diff --git a/satella/time/measure.py b/satella/time/measure.py index 7ef15ed2..038c81f6 100644 --- a/satella/time/measure.py +++ b/satella/time/measure.py @@ -1,7 +1,11 @@ from ..exceptions import WouldWaitMore -from concurrent.futures._base import Future import typing as tp import time +import copy +import inspect +import warnings +from concurrent.futures import Future +from functools import wraps # import from functools to prevent circular import exception TimeSignal = tp.Callable[[], float] diff --git a/satella/time/misc.py b/satella/time/misc.py index 714ff201..0af9a9b5 100644 --- a/satella/time/misc.py +++ b/satella/time/misc.py @@ -1,16 +1,12 @@ -import copy -import inspect import time import typing as tp -import warnings -from concurrent.futures import Future -from functools import wraps # import from functools to prevent circular import exception -__all__ = ['measure', 'time_as_int', 'time_ms', 'sleep', 'time_us', 'ExponentialBackoff', - 'parse_time_string'] +__all__ = ['time_as_int', 'time_ms', 'sleep', 'time_us', 'ExponentialBackoff'] from satella.coding.concurrent.thread import Condition from satella.exceptions import WouldWaitMore +from .parse import parse_time_string +from .measure import measure def sleep(y: tp.Union[str, float], abort_on_interrupt: bool = False) -> bool: @@ -141,8 +137,6 @@ class ExponentialBackoff: :param timeout: maximum amount of seconds to wait. If waited more than that, WouldWaitMore will be raised - :param sleep_function: a function which will be called with a single argument, - the number of seconds to sleep. This should sleep by that many seconds. :raises WouldWaitMore: waited for timeout and service still was not healthy """ with measure(timeout=timeout) as m: -- GitLab