mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-28 12:57:52 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dan 2021-05-12 09:11:57 +02:00
commit e2ef053949
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyrogram/client.py
View File

@ -397,6 +397,9 @@ class Client(Methods, Scaffold):
@parse_mode.setter
def parse_mode(self, parse_mode: Optional[str] = "combined"):
if isinstance(parse_mode, str):
parse_mode = parse_mode.lower()
if parse_mode not in self.PARSE_MODES:
raise ValueError('parse_mode must be one of {} or None. Not "{}"'.format(
", ".join(f'"{m}"' for m in self.PARSE_MODES[:-1]),

2
pyrogram/types/bots_and_keyboards/callback_query.py
View File

@ -252,7 +252,7 @@ class CallbackQuery(Object, Update):
Raises:
RPCError: In case of a Telegram RPC error.
"""
return await self.edit_message_text(caption, parse_mode, reply_markup)
return await self.edit_message_text(caption, parse_mode, reply_markup=reply_markup)
async def edit_message_media(
self,