OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-03-28 01:11:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Correct Some Type Hints (#2204)

Browse source 
* Correct some reply_markup hints

* Fix type hints of effective_message_type

* fixup
This commit is contained in:
Bibo-Joshi 2020-11-29 16:32:38 +01:00 • committed by GitHub
parent ca04daf782
commit d27d1ea4d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
telegram/bot.py
View file

@ -89,6 +89,7 @@ from telegram import (
InputMediaDocument,
InputMediaPhoto,
InputMediaVideo,
InlineKeyboardMarkup,
)
from telegram.constants import MAX_INLINE_QUERY_RESULTS
from telegram.error import InvalidToken, TelegramError
@ -1459,7 +1460,7 @@ class Bot(TelegramObject):
latitude: float = None,
longitude: float = None,
location: Location = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
api_kwargs: JSONDict = None,
horizontal_accuracy: float = None,
@ -1545,7 +1546,7 @@ class Bot(TelegramObject):
chat_id: Union[str, int] = None,
message_id: Union[str, int] = None,
inline_message_id: Union[str, int] = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
api_kwargs: JSONDict = None,
) -> Union[Optional[Message], bool]:
@ -1794,7 +1795,7 @@ class Bot(TelegramObject):
game_short_name: str,
disable_notification: bool = False,
reply_to_message_id: Union[int, str] = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
api_kwargs: JSONDict = None,
allow_sending_without_reply: bool = None,
@ -2303,7 +2304,7 @@ class Bot(TelegramObject):
inline_message_id: Union[str, int] = None,
parse_mode: str = None,
disable_web_page_preview: bool = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
api_kwargs: JSONDict = None,
entities: Union[List[MessageEntity], Tuple[MessageEntity, ...]] = None,
@ -2373,7 +2374,7 @@ class Bot(TelegramObject):
message_id: Union[str, int] = None,
inline_message_id: Union[str, int] = None,
caption: str = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
parse_mode: str = None,
api_kwargs: JSONDict = None,
@ -2450,7 +2451,7 @@ class Bot(TelegramObject):
message_id: Union[str, int] = None,
inline_message_id: Union[str, int] = None,
media: InputMedia = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
api_kwargs: JSONDict = None,
) -> Union[Message, bool]:
@ -2516,7 +2517,7 @@ class Bot(TelegramObject):
chat_id: Union[str, int] = None,
message_id: Union[str, int] = None,
inline_message_id: Union[str, int] = None,
reply_markup: ReplyMarkup = None,
reply_markup: Optional[InlineKeyboardMarkup] = None,
timeout: float = None,
api_kwargs: JSONDict = None,
) -> Union[Message, bool]:
@ -3144,7 +3145,7 @@ class Bot(TelegramObject):
is_flexible: bool = None,
disable_notification: bool = False,
reply_to_message_id: Union[int, str] = None,
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
provider_data: Union[str, object] = None,
send_phone_number_to_provider: bool = None,
send_email_to_provider: bool = None,
@ -4400,7 +4401,7 @@ class Bot(TelegramObject):
self,
chat_id: Union[int, str],
message_id: Union[int, str],
reply_markup: ReplyMarkup = None,
reply_markup: InlineKeyboardMarkup = None,
timeout: float = None,
api_kwargs: JSONDict = None,
) -> Poll:

6
telegram/utils/helpers.py
View file

@ -35,7 +35,7 @@ import pytz # pylint: disable=E0401
from telegram.utils.types import JSONDict, FileInput
if TYPE_CHECKING:
from telegram import MessageEntity, TelegramObject, InputFile
from telegram import Message, Update, TelegramObject, InputFile
try:
import ujson as json
@ -320,7 +320,7 @@ def mention_markdown(user_id: Union[int, str], name: str, version: int = 1) -> s
return u'[{}](tg://user?id={})'.format(escape_markdown(name, version=version), user_id)
def effective_message_type(entity: 'MessageEntity') -> Optional[str]:
def effective_message_type(entity: Union['Message', 'Update']) -> Optional[str]:
"""
Extracts the type of message as a string identifier from a :class:`telegram.Message` or a
:class:`telegram.Update`.
@ -339,7 +339,7 @@ def effective_message_type(entity: 'MessageEntity') -> Optional[str]:
if isinstance(entity, Message):
message = entity
elif isinstance(entity, Update):
message = entity.effective_message
message = entity.effective_message # type: ignore[assignment]
else:
raise TypeError(f"entity is not Message or Update (got: {type(entity)})")