python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev-3.x' into dev-3.x-sphinx

Browse source
This commit is contained in:
Alex Root Junior 2020-06-27 17:29:34 +03:00
commit 8ebbfb1388
4 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aiogram/api/client/bot.py
View file

@ -1221,7 +1221,7 @@ class Bot(ContextInstanceMixin["Bot"]):
allows_multiple_answers: Optional[bool] = None,
correct_option_id: Optional[int] = None,
explanation: Optional[str] = None,
explanation_parse_mode: Optional[str] = None,
explanation_parse_mode: Optional[str] = UNSET,
open_period: Optional[int] = None,
close_date: Optional[Union[datetime.datetime, datetime.timedelta, int]] = None,
is_closed: Optional[bool] = None,

5
aiogram/api/methods/base.py
View file

@ -56,8 +56,9 @@ class TelegramMethod(abc.ABC, BaseModel, Generic[T]):
a model initialization from `Bot.method_name`, so we must take care of it and
remove it before fields validation.
"""
if "parse_mode" in values and values["parse_mode"] is UNSET:
values.pop("parse_mode")
for parse_mode_attribute in {"parse_mode", "explanation_parse_mode"}:
if parse_mode_attribute in values and values[parse_mode_attribute] is UNSET:
values.pop(parse_mode_attribute)
return values
@property

3
aiogram/api/methods/send_poll.py
View file

@ -4,6 +4,7 @@ import datetime
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
from ..types import (
UNSET,
ForceReply,
InlineKeyboardMarkup,
Message,
@ -44,7 +45,7 @@ class SendPoll(TelegramMethod[Message]):
explanation: Optional[str] = None
"""Text that is shown when a user chooses an incorrect answer or taps on the lamp icon in a
quiz-style poll, 0-200 characters with at most 2 line feeds after entities parsing"""
explanation_parse_mode: Optional[str] = None
explanation_parse_mode: Optional[str] = UNSET
"""Mode for parsing entities in the explanation. See formatting options for more details."""
open_period: Optional[int] = None
"""Amount of time in seconds the poll will be active after creation, 5-600. Can't be used

34
aiogram/api/types/message.py
View file

@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, List, Optional, Union
from pydantic import Field
from ...utils import helper
from .base import TelegramObject
from .base import UNSET, TelegramObject
if TYPE_CHECKING: # pragma: no cover
from .animation import Animation
@ -256,7 +256,7 @@ class Message(TelegramObject):
height: Optional[int] = None,
thumb: Optional[Union[InputFile, str]] = None,
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply]
@ -300,7 +300,7 @@ class Message(TelegramObject):
height: Optional[int] = None,
thumb: Optional[Union[InputFile, str]] = None,
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply]
@ -340,7 +340,7 @@ class Message(TelegramObject):
self,
audio: Union[InputFile, str],
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
duration: Optional[int] = None,
performer: Optional[str] = None,
title: Optional[str] = None,
@ -384,7 +384,7 @@ class Message(TelegramObject):
self,
audio: Union[InputFile, str],
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
duration: Optional[int] = None,
performer: Optional[str] = None,
title: Optional[str] = None,
@ -499,7 +499,7 @@ class Message(TelegramObject):
document: Union[InputFile, str],
thumb: Optional[Union[InputFile, str]] = None,
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply]
@ -534,7 +534,7 @@ class Message(TelegramObject):
document: Union[InputFile, str],
thumb: Optional[Union[InputFile, str]] = None,
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply]
@ -877,7 +877,7 @@ class Message(TelegramObject):
def reply(
self,
text: str,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_web_page_preview: Optional[bool] = None,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
@ -909,7 +909,7 @@ class Message(TelegramObject):
def answer(
self,
text: str,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_web_page_preview: Optional[bool] = None,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
@ -942,7 +942,7 @@ class Message(TelegramObject):
self,
photo: Union[InputFile, str],
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply]
@ -974,7 +974,7 @@ class Message(TelegramObject):
self,
photo: Union[InputFile, str],
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove, ForceReply]
@ -1011,7 +1011,7 @@ class Message(TelegramObject):
allows_multiple_answers: Optional[bool] = None,
correct_option_id: Optional[int] = None,
explanation: Optional[str] = None,
explanation_parse_mode: Optional[str] = None,
explanation_parse_mode: Optional[str] = UNSET,
open_period: Optional[int] = None,
close_date: Optional[Union[datetime.datetime, datetime.timedelta, int]] = None,
is_closed: Optional[bool] = None,
@ -1067,7 +1067,7 @@ class Message(TelegramObject):
allows_multiple_answers: Optional[bool] = None,
correct_option_id: Optional[int] = None,
explanation: Optional[str] = None,
explanation_parse_mode: Optional[str] = None,
explanation_parse_mode: Optional[str] = UNSET,
open_period: Optional[int] = None,
close_date: Optional[Union[datetime.datetime, datetime.timedelta, int]] = None,
is_closed: Optional[bool] = None,
@ -1308,7 +1308,7 @@ class Message(TelegramObject):
height: Optional[int] = None,
thumb: Optional[Union[InputFile, str]] = None,
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
supports_streaming: Optional[bool] = None,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
@ -1355,7 +1355,7 @@ class Message(TelegramObject):
height: Optional[int] = None,
thumb: Optional[Union[InputFile, str]] = None,
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
supports_streaming: Optional[bool] = None,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
@ -1468,7 +1468,7 @@ class Message(TelegramObject):
self,
voice: Union[InputFile, str],
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
duration: Optional[int] = None,
disable_notification: Optional[bool] = None,
reply_markup: Optional[
@ -1503,7 +1503,7 @@ class Message(TelegramObject):
self,
voice: Union[InputFile, str],
caption: Optional[str] = None,
parse_mode: Optional[str] = None,
parse_mode: Optional[str] = UNSET,
duration: Optional[int] = None,
disable_notification: Optional[bool] = None,
reply_markup: Optional[