LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-24 10:23:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check for event loop method, not type (#1337)

Browse Source
This commit is contained in:
Lonami Exo 2019-12-06 10:23:15 +01:00
parent 03f0533139
commit b8aa639f3c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
telethon/client/telegrambaseclient.py
View File

@ -252,22 +252,16 @@ class TelegramBaseClient(abc.ABC):
self.api_id = int(api_id) self.api_id = int(api_id)
self.api_hash = api_hash self.api_hash = api_hash
# Python 3.8 changed the default event loop on Windows, # Current proxy implementation requires `sock_connect`, and some
# which is now ProactorEventLoop and has some issues with # event loops lack this method. If the current loop is missing it,
# the current proxy implementation (it lacks sock_connect). # bail out early and suggest an alternative.
# #
# If we're using ProactorEventLoop and have a proxy, bail out # TODO A better fix is obviously avoiding the use of `sock_connect`
# early asking the user to consider changing the event loop
# TODO until we apply a different fix to this.
# #
# See https://github.com/LonamiWebs/Telethon/issues/1337 for details. # See https://github.com/LonamiWebs/Telethon/issues/1337 for details.
proactor = getattr(asyncio, 'ProactorEventLoop', None) if not callable(getattr(self._loop, 'sock_connect', None)):
if (proxy is not None
and proactor is not None
and sys.version_info >= (3, 8)
and isinstance(self._loop, proactor)):
raise TypeError( raise TypeError(
'Cannot use the event loop of type {} with a proxy.\n\n' 'Event loop of type {} lacks `sock_connect`, which is needed to use proxies.\n\n'
'Change the event loop in use to use proxies:\n' 'Change the event loop in use to use proxies:\n'
'# https://github.com/LonamiWebs/Telethon/issues/1337\n' '# https://github.com/LonamiWebs/Telethon/issues/1337\n'
'import asyncio\n' 'import asyncio\n'