LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-09-21 11:18:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix creating new connections accessing invalid attributes

Browse Source
This commit is contained in:
Lonami Exo 2017-09-22 16:11:07 +02:00
parent bfa3001f87
commit b0f6b23e52
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
telethon/extensions/tcp_client.py
View File

@ -8,7 +8,7 @@ from threading import Lock
class TcpClient:
def __init__(self, proxy=None, timeout=timedelta(seconds=5)):
self._proxy = proxy
self.proxy = proxy
self._socket = None
self._closing_lock = Lock()
@ -20,15 +20,15 @@ class TcpClient:
raise ValueError('Invalid timeout type', type(timeout))
def _recreate_socket(self, mode):
if self._proxy is None:
if self.proxy is None:
self._socket = socket.socket(mode, socket.SOCK_STREAM)
else:
import socks
self._socket = socks.socksocket(mode, socket.SOCK_STREAM)
if type(self._proxy) is dict:
self._socket.set_proxy(**self._proxy)
if type(self.proxy) is dict:
self._socket.set_proxy(**self.proxy)
else: # tuple, list, etc.
self._socket.set_proxy(*self._proxy)
self._socket.set_proxy(*self.proxy)
self._socket.settimeout(self.timeout)

3
telethon/telegram_bare_client.py
View File

@ -276,7 +276,8 @@ class TelegramBareClient:
session.port = dc.port
client = TelegramBareClient(
session, self.api_id, self.api_hash,
timeout=self._connection.get_timeout()
proxy=self._sender.connection.conn.proxy,
timeout=self._sender.connection.get_timeout()
)
client.connect(exported_auth=export_auth)

2
telethon/telegram_client.py
View File

@ -225,7 +225,7 @@ class TelegramClient(TelegramBareClient):
if on_dc is None:
client = TelegramBareClient(
self.session, self.api_id, self.api_hash,
proxy=self.proxy, timeout=timeout
proxy=self._sender.connection.conn.proxy, timeout=timeout
)
client.connect()
else: