From e1f8807d837da19a03ca526b0bc98d0976655ca9 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Thu, 28 Jun 2018 15:22:22 +0200 Subject: [PATCH] Fix sleeps --- telethon/client/messages.py | 4 ++-- telethon/client/updates.py | 9 +++------ telethon/client/users.py | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/telethon/client/messages.py b/telethon/client/messages.py index f47cd25e..f27db425 100644 --- a/telethon/client/messages.py +++ b/telethon/client/messages.py @@ -242,8 +242,8 @@ class MessageMethods(UploadMethods, MessageParseMethods): else: request.max_date = last_message.date - asyncio.sleep( - max(wait_time - (time.time() - start), 0), loop=self._loop) + time.sleep( + max(wait_time - (time.time() - start), 0)) def get_messages(self, *args, **kwargs): """ diff --git a/telethon/client/updates.py b/telethon/client/updates.py index 6c324921..edb14096 100644 --- a/telethon/client/updates.py +++ b/telethon/client/updates.py @@ -1,5 +1,4 @@ -import asyncio -import inspect +import concurrent.futures import itertools import logging import random @@ -188,11 +187,9 @@ class UpdateMethods(UserMethods): rnd = lambda: random.randrange(-2**63, 2**63) while self.is_connected(): try: - asyncio.wait_for( - self.disconnected, timeout=60, loop=self._loop - ) + concurrent.futures.wait([self.disconnected], timeout=60) continue # We actually just want to act upon timeout - except asyncio.TimeoutError: + except concurrent.futures.TimeoutError: pass except: continue # Any disconnected exception should be ignored diff --git a/telethon/client/users.py b/telethon/client/users.py index 3133ef1f..66308cd6 100644 --- a/telethon/client/users.py +++ b/telethon/client/users.py @@ -39,7 +39,7 @@ class UserMethods(TelegramBaseClient): except (errors.FloodWaitError, errors.FloodTestPhoneWaitError) as e: if e.seconds <= self.flood_sleep_threshold: __log__.info('Sleeping for %ds on flood wait', e.seconds) - asyncio.sleep(e.seconds, loop=self._loop) + time.sleep(e.seconds) else: raise except (errors.PhoneMigrateError, errors.NetworkMigrateError,