From 7e68274f26c825e02db4eb03f9e5a42405339165 Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Sat, 9 Jun 2018 15:42:10 +0200
Subject: [PATCH] Keep consistent structure and remove done TODO

---
 telethon/extensions/tcp_client.py |  2 --
 telethon/network/mtprotosender.py | 34 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/telethon/extensions/tcp_client.py b/telethon/extensions/tcp_client.py
index 8251c5d0..9fe3e73c 100644
--- a/telethon/extensions/tcp_client.py
+++ b/telethon/extensions/tcp_client.py
@@ -21,8 +21,6 @@ except ImportError:
 __log__ = logging.getLogger(__name__)
 
 
-# TODO Except asyncio.TimeoutError, ConnectionError, OSError...
-# ...for connect, write and read (in the upper levels, not here)
 class TcpClient:
     """A simple TCP client to ease the work with sockets and proxies."""
     def __init__(self, proxy=None, timeout=5):
diff --git a/telethon/network/mtprotosender.py b/telethon/network/mtprotosender.py
index 5044a0ef..2053da97 100644
--- a/telethon/network/mtprotosender.py
+++ b/telethon/network/mtprotosender.py
@@ -250,6 +250,23 @@ class MTProtoSender:
         self._reconnecting = False
         await self._connect()
 
+    def _clean_containers(self, msg_ids):
+        """
+        Helper method to clean containers from the pending messages
+        once a wrapped msg_id of them has been acknowledged.
+
+        This is the only way we can resend TLMessage(MessageContainer)
+        on bad notifications and also mark them as received once any
+        of their inner TLMessage is acknowledged.
+        """
+        for i in reversed(range(len(self._pending_containers))):
+            message = self._pending_containers[i]
+            for msg in message.obj.messages:
+                if msg.msg_id in msg_ids:
+                    del self._pending_containers[i]
+                    del self._pending_messages[message.msg_id]
+                    break
+
     # Loops
 
     async def _send_loop(self):
@@ -521,23 +538,6 @@ class MTProtoSender:
         __log__.debug('Handling new session created')
         self.state.salt = message.obj.server_salt
 
-    def _clean_containers(self, msg_ids):
-        """
-        Helper method to clean containers from the pending messages
-        once a wrapped msg_id of them has been acknowledged.
-
-        This is the only way we can resend TLMessage(MessageContainer)
-        on bad notifications and also mark them as received once any
-        of their inner TLMessage is acknowledged.
-        """
-        for i in reversed(range(len(self._pending_containers))):
-            message = self._pending_containers[i]
-            for msg in message.obj.messages:
-                if msg.msg_id in msg_ids:
-                    del self._pending_containers[i]
-                    del self._pending_messages[message.msg_id]
-                    break
-
     async def _handle_ack(self, message):
         """
         Handles a server acknowledge about our messages. Normally