From 1762f554df897ba000acd16034c102ec54c406ca Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Fri, 24 Sep 2021 21:11:50 +0200 Subject: [PATCH] Make events subpackage private --- telethon/_client/telegramclient.py | 2 +- telethon/_client/updates.py | 16 +++++++++------- telethon/_events/__init__.py | 0 telethon/{events => _events}/album.py | 0 telethon/{events/__init__.py => _events/base.py} | 9 --------- telethon/{events => _events}/callbackquery.py | 0 telethon/{events => _events}/chataction.py | 0 telethon/{events => _events}/common.py | 0 telethon/{events => _events}/inlinequery.py | 0 telethon/{events => _events}/messagedeleted.py | 0 telethon/{events => _events}/messageedited.py | 0 telethon/{events => _events}/messageread.py | 0 telethon/{events => _events}/newmessage.py | 0 telethon/{events => _events}/raw.py | 0 telethon/{events => _events}/userupdate.py | 0 telethon/events.py | 12 ++++++++++++ telethon/types/_custom/qrlogin.py | 5 +++-- 17 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 telethon/_events/__init__.py rename telethon/{events => _events}/album.py (100%) rename telethon/{events/__init__.py => _events/base.py} (92%) rename telethon/{events => _events}/callbackquery.py (100%) rename telethon/{events => _events}/chataction.py (100%) rename telethon/{events => _events}/common.py (100%) rename telethon/{events => _events}/inlinequery.py (100%) rename telethon/{events => _events}/messagedeleted.py (100%) rename telethon/{events => _events}/messageedited.py (100%) rename telethon/{events => _events}/messageread.py (100%) rename telethon/{events => _events}/newmessage.py (100%) rename telethon/{events => _events}/raw.py (100%) rename telethon/{events => _events}/userupdate.py (100%) create mode 100644 telethon/events.py diff --git a/telethon/_client/telegramclient.py b/telethon/_client/telegramclient.py index 54ab9710..5812296c 100644 --- a/telethon/_client/telegramclient.py +++ b/telethon/_client/telegramclient.py @@ -11,7 +11,7 @@ from . import ( from .. import helpers, version, _tl from ..types import _custom from .._network import ConnectionTcpFull -from ..events.common import EventBuilder, EventCommon +from .._events.common import EventBuilder, EventCommon from .._misc import enums diff --git a/telethon/_client/updates.py b/telethon/_client/updates.py index da60b24c..6ff3c9d1 100644 --- a/telethon/_client/updates.py +++ b/telethon/_client/updates.py @@ -8,9 +8,11 @@ import traceback import typing import logging -from .. import events, utils, _tl +from .. import utils, _tl from ..errors._rpcbase import RpcError -from ..events.common import EventBuilder, EventCommon +from .._events.common import EventBuilder, EventCommon +from .._events.raw import Raw +from .._events.base import StopPropagation, _get_handlers if typing.TYPE_CHECKING: from .telegramclient import TelegramClient @@ -40,7 +42,7 @@ def add_event_handler( self: 'TelegramClient', callback: Callback, event: EventBuilder = None): - builders = events._get_handlers(callback) + builders = _get_handlers(callback) if builders is not None: for event in builders: self._event_builders.append((event, callback)) @@ -49,7 +51,7 @@ def add_event_handler( if isinstance(event, type): event = event() elif not event: - event = events.Raw() + event = Raw() self._event_builders.append((event, callback)) @@ -274,7 +276,7 @@ async def _dispatch_update(self: 'TelegramClient', update, others, channel_id, p try: await callback(event) - except events.StopPropagation: + except StopPropagation: name = getattr(callback, '__name__', repr(callback)) self._log[__name__].debug( 'Event handler "%s" stopped chain of propagation ' @@ -294,7 +296,7 @@ async def _dispatch_event(self: 'TelegramClient', event): # the name of speed; we don't want to make it worse for all updates # just because albums may need it. for builder, callback in self._event_builders: - if isinstance(builder, events.Raw): + if isinstance(builder, Raw): continue if not isinstance(event, builder.Event): continue @@ -310,7 +312,7 @@ async def _dispatch_event(self: 'TelegramClient', event): try: await callback(event) - except events.StopPropagation: + except StopPropagation: name = getattr(callback, '__name__', repr(callback)) self._log[__name__].debug( 'Event handler "%s" stopped chain of propagation ' diff --git a/telethon/_events/__init__.py b/telethon/_events/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/telethon/events/album.py b/telethon/_events/album.py similarity index 100% rename from telethon/events/album.py rename to telethon/_events/album.py diff --git a/telethon/events/__init__.py b/telethon/_events/base.py similarity index 92% rename from telethon/events/__init__.py rename to telethon/_events/base.py index 28f85b12..8f913ad7 100644 --- a/telethon/events/__init__.py +++ b/telethon/_events/base.py @@ -1,13 +1,4 @@ from .raw import Raw -from .album import Album -from .chataction import ChatAction -from .messagedeleted import MessageDeleted -from .messageedited import MessageEdited -from .messageread import MessageRead -from .newmessage import NewMessage -from .userupdate import UserUpdate -from .callbackquery import CallbackQuery -from .inlinequery import InlineQuery _HANDLERS_ATTRIBUTE = '__tl.handlers' diff --git a/telethon/events/callbackquery.py b/telethon/_events/callbackquery.py similarity index 100% rename from telethon/events/callbackquery.py rename to telethon/_events/callbackquery.py diff --git a/telethon/events/chataction.py b/telethon/_events/chataction.py similarity index 100% rename from telethon/events/chataction.py rename to telethon/_events/chataction.py diff --git a/telethon/events/common.py b/telethon/_events/common.py similarity index 100% rename from telethon/events/common.py rename to telethon/_events/common.py diff --git a/telethon/events/inlinequery.py b/telethon/_events/inlinequery.py similarity index 100% rename from telethon/events/inlinequery.py rename to telethon/_events/inlinequery.py diff --git a/telethon/events/messagedeleted.py b/telethon/_events/messagedeleted.py similarity index 100% rename from telethon/events/messagedeleted.py rename to telethon/_events/messagedeleted.py diff --git a/telethon/events/messageedited.py b/telethon/_events/messageedited.py similarity index 100% rename from telethon/events/messageedited.py rename to telethon/_events/messageedited.py diff --git a/telethon/events/messageread.py b/telethon/_events/messageread.py similarity index 100% rename from telethon/events/messageread.py rename to telethon/_events/messageread.py diff --git a/telethon/events/newmessage.py b/telethon/_events/newmessage.py similarity index 100% rename from telethon/events/newmessage.py rename to telethon/_events/newmessage.py diff --git a/telethon/events/raw.py b/telethon/_events/raw.py similarity index 100% rename from telethon/events/raw.py rename to telethon/_events/raw.py diff --git a/telethon/events/userupdate.py b/telethon/_events/userupdate.py similarity index 100% rename from telethon/events/userupdate.py rename to telethon/_events/userupdate.py diff --git a/telethon/events.py b/telethon/events.py new file mode 100644 index 00000000..5dca03ae --- /dev/null +++ b/telethon/events.py @@ -0,0 +1,12 @@ +from ._events.base import StopPropagation, register, unregister, is_handler, list +from ._events.raw import Raw + +from ._events.album import Album +from ._events.chataction import ChatAction +from ._events.messagedeleted import MessageDeleted +from ._events.messageedited import MessageEdited +from ._events.messageread import MessageRead +from ._events.newmessage import NewMessage +from ._events.userupdate import UserUpdate +from ._events.callbackquery import CallbackQuery +from ._events.inlinequery import InlineQuery diff --git a/telethon/types/_custom/qrlogin.py b/telethon/types/_custom/qrlogin.py index 9a48884a..473e4bd0 100644 --- a/telethon/types/_custom/qrlogin.py +++ b/telethon/types/_custom/qrlogin.py @@ -2,7 +2,8 @@ import asyncio import base64 import datetime -from ... import events, _tl +from ... import _tl +from ..._events.raw import Raw class QRLogin: @@ -94,7 +95,7 @@ class QRLogin: async def handler(_update): event.set() - self._client.add_event_handler(handler, events.Raw(_tl.UpdateLoginToken)) + self._client.add_event_handler(handler, Raw(_tl.UpdateLoginToken)) try: # Will raise timeout error if it doesn't complete quick enough,