From 64dd957189e7de3d7a1a8cf7a64e4441a0e72a38 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Mon, 11 Jun 2018 19:51:01 +0200 Subject: [PATCH] Fix None first_query and TcpClient.disconnect() --- telethon/extensions/tcp_client.py | 3 ++- telethon/network/mtprotosender.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/telethon/extensions/tcp_client.py b/telethon/extensions/tcp_client.py index 9fe3e73c..850b515d 100644 --- a/telethon/extensions/tcp_client.py +++ b/telethon/extensions/tcp_client.py @@ -84,8 +84,9 @@ class TcpClient: """Closes the connection.""" if self._socket is not None: try: - self._socket.shutdown(socket.SHUT_RDWR) self._socket.close() + except OSError: + pass finally: self._socket = None diff --git a/telethon/network/mtprotosender.py b/telethon/network/mtprotosender.py index eb865f7a..1292fdac 100644 --- a/telethon/network/mtprotosender.py +++ b/telethon/network/mtprotosender.py @@ -215,7 +215,7 @@ class MTProtoSender: __log__.debug('Connection success!') if self.state.auth_key is None: - self._is_first_query = True + self._is_first_query = bool(self._first_query) _last_error = SecurityError() plain = MTProtoPlainSender(self._connection) for retry in range(1, self._retries + 1):