From f1f7479cdb6ce5f091ef146ab606bae5ffc74648 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Fri, 20 Aug 2021 23:33:21 -0400 Subject: [PATCH] passing loop to asyncio functions is deprecated --- lbry/extras/daemon/exchange_rate_manager.py | 2 -- lbry/stream/stream_manager.py | 2 -- lbry/wallet/coinselection.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lbry/extras/daemon/exchange_rate_manager.py b/lbry/extras/daemon/exchange_rate_manager.py index 07730611b..7f555fd9e 100644 --- a/lbry/extras/daemon/exchange_rate_manager.py +++ b/lbry/extras/daemon/exchange_rate_manager.py @@ -80,8 +80,6 @@ class MarketFeed: self.rate = ExchangeRate(self.market, rate, int(time.time())) self.last_check = time.time() return self.rate - except asyncio.CancelledError: - raise except asyncio.TimeoutError: log.warning("Timed out fetching exchange rate from %s.", self.name) except json.JSONDecodeError as e: diff --git a/lbry/stream/stream_manager.py b/lbry/stream/stream_manager.py index 7ecf7e442..0e4c1e248 100644 --- a/lbry/stream/stream_manager.py +++ b/lbry/stream/stream_manager.py @@ -164,8 +164,6 @@ class StreamManager(SourceManager): async def reflect_streams(self): try: return await self._reflect_streams() - except asyncio.CancelledError: - raise except Exception: log.exception("reflector task encountered an unexpected error!") diff --git a/lbry/wallet/coinselection.py b/lbry/wallet/coinselection.py index 182c6d0d4..908406300 100644 --- a/lbry/wallet/coinselection.py +++ b/lbry/wallet/coinselection.py @@ -141,7 +141,7 @@ class CoinSelector: _) -> List[OutputEffectiveAmountEstimator]: """ Accumulate UTXOs at random until there is enough to cover the target. """ target = self.target + self.cost_of_change - self.random.shuffle(txos, self.random.random) + self.random.shuffle(txos) selection = [] amount = 0 for coin in txos: