diff --git a/telethon/client/messageparse.py b/telethon/client/messageparse.py index 0adea5d6..b4b92147 100644 --- a/telethon/client/messageparse.py +++ b/telethon/client/messageparse.py @@ -2,7 +2,7 @@ import itertools import re from .users import UserMethods -from .. import default, utils +from .. import utils from ..tl import types @@ -62,7 +62,7 @@ class MessageParseMethods(UserMethods): """ Returns a (parsed message, entities) tuple depending on ``parse_mode``. """ - if parse_mode == default: + if parse_mode is (): parse_mode = self._parse_mode else: parse_mode = utils.sanitize_parse_mode(parse_mode) diff --git a/telethon/client/messages.py b/telethon/client/messages.py index c86acfdc..42eb746f 100644 --- a/telethon/client/messages.py +++ b/telethon/client/messages.py @@ -8,7 +8,7 @@ from async_generator import async_generator, yield_ from .messageparse import MessageParseMethods from .uploads import UploadMethods from .buttons import ButtonMethods -from .. import default, helpers, utils +from .. import helpers, utils from ..tl import types, functions __log__ = logging.getLogger(__name__) @@ -360,7 +360,7 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods): async def send_message( self, entity, message='', *, reply_to=None, - parse_mode=default, link_preview=True, file=None, + parse_mode=(), link_preview=True, file=None, force_document=False, clear_draft=False, buttons=None, silent=None): """ @@ -583,7 +583,7 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods): async def edit_message( self, entity, message=None, text=None, - *, parse_mode=default, link_preview=True, file=None, + *, parse_mode=(), link_preview=True, file=None, buttons=None): """ Edits the given message ID (to change its contents or disable preview). diff --git a/telethon/client/uploads.py b/telethon/client/uploads.py index a95f869a..107c2fdc 100644 --- a/telethon/client/uploads.py +++ b/telethon/client/uploads.py @@ -9,7 +9,6 @@ from io import BytesIO from .buttons import ButtonMethods from .messageparse import MessageParseMethods from .users import UserMethods -from .. import default from .. import utils, helpers from ..tl import types, functions, custom @@ -23,7 +22,7 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods): async def send_file( self, entity, file, *, caption='', force_document=False, progress_callback=None, reply_to=None, attributes=None, - thumb=None, allow_cache=True, parse_mode=default, + thumb=None, allow_cache=True, parse_mode=(), voice_note=False, video_note=False, buttons=None, silent=None, **kwargs): """ @@ -183,7 +182,7 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods): async def _send_album(self, entity, files, caption='', progress_callback=None, reply_to=None, - parse_mode=default, silent=None): + parse_mode=(), silent=None): """Specialized version of .send_file for albums""" # We don't care if the user wants to avoid cache, we will use it # anyway. Why? The cached version will be exactly the same thing diff --git a/telethon/tl/custom/draft.py b/telethon/tl/custom/draft.py index 6d6002f1..05efefc7 100644 --- a/telethon/tl/custom/draft.py +++ b/telethon/tl/custom/draft.py @@ -3,7 +3,6 @@ import datetime from .. import TLObject from ..functions.messages import SaveDraftRequest from ..types import UpdateDraftMessage, DraftMessage -from ... import default from ...errors import RPCError from ...extensions import markdown from ...utils import get_peer_id, get_input_peer @@ -117,7 +116,7 @@ class Draft: return not self._text async def set_message( - self, text=None, reply_to=0, parse_mode=default, + self, text=None, reply_to=0, parse_mode=(), link_preview=None): """ Changes the draft message on the Telegram servers. The changes are @@ -164,7 +163,7 @@ class Draft: return result - async def send(self, clear=True, parse_mode=default): + async def send(self, clear=True, parse_mode=()): """ Sends the contents of this draft to the dialog. This is just a wrapper around ``send_message(dialog.input_entity, *args, **kwargs)``. diff --git a/telethon/tl/custom/inline.py b/telethon/tl/custom/inline.py index 5e576c2d..4a9070be 100644 --- a/telethon/tl/custom/inline.py +++ b/telethon/tl/custom/inline.py @@ -1,7 +1,7 @@ import hashlib from .. import functions, types -from ... import default, utils +from ... import utils class InlineBuilder: @@ -54,7 +54,7 @@ class InlineBuilder: async def article( self, title, description=None, *, url=None, thumb=None, content=None, - id=None, text=None, parse_mode=default, link_preview=True, + id=None, text=None, parse_mode=(), link_preview=True, geo=None, period=60, contact=None, game=False, buttons=None ): """ @@ -104,7 +104,7 @@ class InlineBuilder: async def photo( self, file, *, id=None, - text=None, parse_mode=default, link_preview=True, + text=None, parse_mode=(), link_preview=True, geo=None, period=60, contact=None, game=False, buttons=None ): """ @@ -143,7 +143,7 @@ class InlineBuilder: self, file, title=None, *, description=None, type=None, mime_type=None, attributes=None, force_document=False, voice_note=False, video_note=False, use_cache=True, id=None, - text=None, parse_mode=default, link_preview=True, + text=None, parse_mode=(), link_preview=True, geo=None, period=60, contact=None, game=False, buttons=None ): """ @@ -218,7 +218,7 @@ class InlineBuilder: async def game( self, short_name, *, id=None, - text=None, parse_mode=default, link_preview=True, + text=None, parse_mode=(), link_preview=True, geo=None, period=60, contact=None, game=False, buttons=None ): """ @@ -246,7 +246,7 @@ class InlineBuilder: async def _message( self, *, - text=None, parse_mode=default, link_preview=True, + text=None, parse_mode=(), link_preview=True, geo=None, period=60, contact=None, game=False, buttons=None ): if sum(1 for x in (text, geo, contact, game) if x) != 1: