Fix imports

telethon/events/album.py

@@ -3,7 +3,9 @@ import time
 import weakref
 
 from .common import EventBuilder, EventCommon, name_inner_event
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
+from .._tl import custom
 
 _IGNORE_MAX_SIZE = 100  # len()
 _IGNORE_MAX_AGE = 5  # seconds
@@ -138,7 +140,7 @@ class Album(EventBuilder):
         if len(event.messages) > 1:
             return super().filter(event)
 
-    class Event(EventCommon, _tl.custom.sendergetter.SenderGetter):
+    class Event(EventCommon, custom.sendergetter.SenderGetter):
         """
         Represents the event of a new album.
 
@@ -158,7 +160,7 @@ class Album(EventBuilder):
             super().__init__(chat_peer=chat_peer,
                              msg_id=message.id, broadcast=bool(message.post))
 
-            _tl.custom.sendergetter.SenderGetter.__init__(self, message.sender_id)
+            custom.sendergetter.SenderGetter.__init__(self, message.sender_id)
             self.messages = messages
 
         def _set_client(self, client):

telethon/events/callbackquery.py

@@ -2,7 +2,9 @@ import re
 import struct
 
 from .common import EventBuilder, EventCommon, name_inner_event
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
+from .._tl import custom
 
 
 @name_inner_event
@@ -121,7 +123,7 @@ class CallbackQuery(EventBuilder):
             return self.func(event)
         return True
 
-    class Event(EventCommon, _tl.custom.sendergetter.SenderGetter):
+    class Event(EventCommon, custom.sendergetter.SenderGetter):
         """
         Represents the event of a new callback query.
 
@@ -139,7 +141,7 @@ class CallbackQuery(EventBuilder):
         """
         def __init__(self, query, peer, msg_id):
             super().__init__(peer, msg_id=msg_id)
-            _tl.custom.sendergetter.SenderGetter.__init__(self, query.user_id)
+            custom.sendergetter.SenderGetter.__init__(self, query.user_id)
             self.query = query
             self.data_match = None
             self.pattern_match = None

telethon/events/chataction.py

@@ -1,5 +1,6 @@
 from .common import EventBuilder, EventCommon, name_inner_event
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
 
 
 @name_inner_event

telethon/events/common.py

@@ -2,7 +2,8 @@ import abc
 import asyncio
 import warnings
 
-from .. import utils, _tl
+from .._misc import utils
+from .._tl.custom.chatgetter import ChatGetter
 
 
 async def _into_id_set(client, chats):

telethon/events/inlinequery.py

@@ -4,7 +4,9 @@ import re
 import asyncio
 
 from .common import EventBuilder, EventCommon, name_inner_event
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
+from .._tl import custom
 
 
 @name_inner_event
@@ -72,7 +74,7 @@ class InlineQuery(EventBuilder):
 
         return super().filter(event)
 
-    class Event(EventCommon, _tl.custom.sendergetter.SenderGetter):
+    class Event(EventCommon, custom.sendergetter.SenderGetter):
         """
         Represents the event of a new callback query.
 
@@ -89,7 +91,7 @@ class InlineQuery(EventBuilder):
         """
         def __init__(self, query):
             super().__init__(chat_peer=_tl.PeerUser(query.user_id))
-            _tl.custom.sendergetter.SenderGetter.__init__(self, query.user_id)
+            custom.sendergetter.SenderGetter.__init__(self, query.user_id)
             self.query = query
             self.pattern_match = None
             self._answered = False

telethon/events/messageread.py

@@ -1,5 +1,6 @@
 from .common import EventBuilder, EventCommon, name_inner_event
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
 
 
 @name_inner_event

telethon/events/newmessage.py

@@ -1,7 +1,8 @@
 import re
 
 from .common import EventBuilder, EventCommon, name_inner_event, _into_id_set
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
 
 
 @name_inner_event

telethon/events/raw.py

@@ -1,5 +1,5 @@
 from .common import EventBuilder
-from .. import utils
+from .._misc import utils
 
 
 class Raw(EventBuilder):

telethon/events/userupdate.py

@@ -2,7 +2,9 @@ import datetime
 import functools
 
 from .common import EventBuilder, EventCommon, name_inner_event
-from .. import utils, _tl
+from .._misc import utils
+from .. import _tl
+from .._tl import custom
 
 
 # TODO Either the properties are poorly named or they should be
@@ -63,7 +65,7 @@ class UserUpdate(EventBuilder):
             return cls.Event(update.user_id,
                              typing=update.action)
 
-    class Event(EventCommon, _tl.custom.sendergetter.SenderGetter):
+    class Event(EventCommon, custom.sendergetter.SenderGetter):
         """
         Represents the event of a user update
         such as gone online, started typing, etc.
@@ -85,7 +87,7 @@ class UserUpdate(EventBuilder):
         """
         def __init__(self, peer, *, status=None, chat_peer=None, typing=None):
             super().__init__(chat_peer or peer)
-            _tl.custom.sendergetter.SenderGetter.__init__(self, utils.get_peer_id(peer))
+            custom.sendergetter.SenderGetter.__init__(self, utils.get_peer_id(peer))
 
             self.status = status
             self.action = typing