diff --git a/docs/source/telegram.ext.jobqueue.rst b/docs/source/telegram.ext.jobqueue.rst index a78cc004b..3962d5d88 100644 --- a/docs/source/telegram.ext.jobqueue.rst +++ b/docs/source/telegram.ext.jobqueue.rst @@ -1,5 +1,5 @@ telegram.ext.jobqueue module -============================ +======================== .. automodule:: telegram.ext.jobqueue :members: diff --git a/docs/source/telegram.inlinekeyboardbutton.rst b/docs/source/telegram.inlinekeyboardbutton.rst new file mode 100644 index 000000000..1d71fe458 --- /dev/null +++ b/docs/source/telegram.inlinekeyboardbutton.rst @@ -0,0 +1,7 @@ +telegram.inlinekeyboardbutton module +=========================== + +.. automodule:: telegram.inlinekeyboardbutton + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinekeyboardmarkup.rst b/docs/source/telegram.inlinekeyboardmarkup.rst new file mode 100644 index 000000000..3fbf80776 --- /dev/null +++ b/docs/source/telegram.inlinekeyboardmarkup.rst @@ -0,0 +1,7 @@ +telegram.inlinekeyboardmarkup module +========================== + +.. automodule:: telegram.inlinekeyboardmarkup + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultarticle.rst b/docs/source/telegram.inlinequeryresultarticle.rst new file mode 100644 index 000000000..2f7370139 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultarticle.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultarticle module +================================= + +.. automodule:: telegram.inlinequeryresultarticle + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultaudio.rst b/docs/source/telegram.inlinequeryresultaudio.rst new file mode 100644 index 000000000..7458ef031 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultaudio.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultaudio module +================================= + +.. automodule:: telegram.inlinequeryresultaudio + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedaudio.rst b/docs/source/telegram.inlinequeryresultcachedaudio.rst new file mode 100644 index 000000000..49eb0b853 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedaudio.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedaudio module +================================= + +.. automodule:: telegram.inlinequeryresultcachedaudio + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcacheddocument.rst b/docs/source/telegram.inlinequeryresultcacheddocument.rst new file mode 100644 index 000000000..c574ed656 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcacheddocument.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcacheddocument module +================================= + +.. automodule:: telegram.inlinequeryresultcacheddocument + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedgif.rst b/docs/source/telegram.inlinequeryresultcachedgif.rst new file mode 100644 index 000000000..d34692e52 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedgif.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedgif module +================================= + +.. automodule:: telegram.inlinequeryresultcachedgif + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedmpeg4gif.rst b/docs/source/telegram.inlinequeryresultcachedmpeg4gif.rst new file mode 100644 index 000000000..953f754b6 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedmpeg4gif.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedmpeg4gif module +================================= + +.. automodule:: telegram.inlinequeryresultcachedmpeg4gif + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedphoto.rst b/docs/source/telegram.inlinequeryresultcachedphoto.rst new file mode 100644 index 000000000..2560e24c8 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedphoto.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedphoto module +================================= + +.. automodule:: telegram.inlinequeryresultcachedphoto + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedsticker.rst b/docs/source/telegram.inlinequeryresultcachedsticker.rst new file mode 100644 index 000000000..ca90b49a8 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedsticker.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedsticker module +================================= + +.. automodule:: telegram.inlinequeryresultcachedsticker + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedvideo.rst b/docs/source/telegram.inlinequeryresultcachedvideo.rst new file mode 100644 index 000000000..242dc36ba --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedvideo.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedvideo module +================================= + +.. automodule:: telegram.inlinequeryresultcachedvideo + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcachedvoice.rst b/docs/source/telegram.inlinequeryresultcachedvoice.rst new file mode 100644 index 000000000..5b9b362ed --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcachedvoice.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcachedvoice module +================================= + +.. automodule:: telegram.inlinequeryresultcachedvoice + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultcontact.rst b/docs/source/telegram.inlinequeryresultcontact.rst new file mode 100644 index 000000000..da5d91f08 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultcontact.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultcontact module +================================= + +.. automodule:: telegram.inlinequeryresultcontact + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultdocument.rst b/docs/source/telegram.inlinequeryresultdocument.rst new file mode 100644 index 000000000..08a8a44be --- /dev/null +++ b/docs/source/telegram.inlinequeryresultdocument.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultdocument module +================================= + +.. automodule:: telegram.inlinequeryresultdocument + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultgif.rst b/docs/source/telegram.inlinequeryresultgif.rst new file mode 100644 index 000000000..0fd6f06f7 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultgif.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultgif module +================================= + +.. automodule:: telegram.inlinequeryresultgif + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultlocation.rst b/docs/source/telegram.inlinequeryresultlocation.rst new file mode 100644 index 000000000..7c06a2df1 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultlocation.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultlocation module +================================= + +.. automodule:: telegram.inlinequeryresultlocation + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultmpeg4gif.rst b/docs/source/telegram.inlinequeryresultmpeg4gif.rst new file mode 100644 index 000000000..9ed46db6c --- /dev/null +++ b/docs/source/telegram.inlinequeryresultmpeg4gif.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultmpeg4gif module +================================= + +.. automodule:: telegram.inlinequeryresultmpeg4gif + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultphoto.rst b/docs/source/telegram.inlinequeryresultphoto.rst new file mode 100644 index 000000000..1162bd203 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultphoto.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultphoto module +================================= + +.. automodule:: telegram.inlinequeryresultphoto + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultvenue.rst b/docs/source/telegram.inlinequeryresultvenue.rst new file mode 100644 index 000000000..bcd8e2354 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultvenue.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultvenue module +================================= + +.. automodule:: telegram.inlinequeryresultvenue + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultvideo.rst b/docs/source/telegram.inlinequeryresultvideo.rst new file mode 100644 index 000000000..3245bcdc5 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultvideo.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultvideo module +================================= + +.. automodule:: telegram.inlinequeryresultvideo + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.inlinequeryresultvoice.rst b/docs/source/telegram.inlinequeryresultvoice.rst new file mode 100644 index 000000000..d33fc0e52 --- /dev/null +++ b/docs/source/telegram.inlinequeryresultvoice.rst @@ -0,0 +1,7 @@ +telegram.inlinequeryresultvoice module +================================= + +.. automodule:: telegram.inlinequeryresultvoice + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/telegram.rst b/docs/source/telegram.rst index b1bc16851..abd4e6803 100644 --- a/docs/source/telegram.rst +++ b/docs/source/telegram.rst @@ -12,6 +12,27 @@ Submodules telegram.ext telegram.inlinequery telegram.inlinequeryresult + telegram.inlinekeyboardbutton + telegram.inlinekeyboardmarkup + telegram.inlinequeryresultarticle + telegram.inlinequeryresultaudio + telegram.inlinequeryresultcachedaudio + telegram.inlinequeryresultcacheddocument + telegram.inlinequeryresultcachedgif + telegram.inlinequeryresultcachedmpeg4gif + telegram.inlinequeryresultcachedphoto + telegram.inlinequeryresultcachedsticker + telegram.inlinequeryresultcachedvideo + telegram.inlinequeryresultcachedvoice + telegram.inlinequeryresultcontact + telegram.inlinequeryresultdocument + telegram.inlinequeryresultgif + telegram.inlinequeryresultlocation + telegram.inlinequeryresultmpeg4gif + telegram.inlinequeryresultphoto + telegram.inlinequeryresultvenue + telegram.inlinequeryresultvideo + telegram.inlinequeryresultvoice telegram.choseninlineresult telegram.chataction telegram.contact diff --git a/telegram/bot.py b/telegram/bot.py index 265b8df2d..e6a4b35d2 100644 --- a/telegram/bot.py +++ b/telegram/bot.py @@ -208,8 +208,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -258,8 +258,8 @@ class Bot(TelegramObject): receive a notification with no sound. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -317,8 +317,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -387,8 +387,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -447,8 +447,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -499,8 +499,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -556,8 +556,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -618,8 +618,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -671,8 +671,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -733,8 +733,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -794,8 +794,8 @@ class Bot(TelegramObject): keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -1184,8 +1184,8 @@ class Bot(TelegramObject): A JSON-serialized object for an inline keyboard. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. @@ -1239,8 +1239,8 @@ class Bot(TelegramObject): A JSON-serialized object for an inline keyboard. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. - network_delay (Optional[float]): If using the timeout (which - is a `timeout` for the Telegram servers operation), + network_delay (Optional[float]): If using the timeout (which is + a `timeout` for the Telegram servers operation), then `network_delay` as an extra delay (in seconds) to compensate for network latency. Defaults to 2. diff --git a/telegram/inlinequeryresultarticle.py b/telegram/inlinequeryresultarticle.py index 0bfe19a1b..936ff52c0 100644 --- a/telegram/inlinequeryresultarticle.py +++ b/telegram/inlinequeryresultarticle.py @@ -39,6 +39,14 @@ class InlineQueryResultArticle(InlineQueryResult): thumb_width (int): thumb_height (int): + Deprecated: 4.0 + message_text (str): Use :class:`InputTextMessageContent` instead. + + parse_mode (str): Use :class:`InputTextMessageContent` instead. + + disable_web_page_preview (bool): Use :class:`InputTextMessageContent` + instead. + Args: id (str): Unique identifier for this result, 1-64 Bytes title (str): diff --git a/telegram/inlinequeryresultaudio.py b/telegram/inlinequeryresultaudio.py index ac4b6f7dd..2b2988ad2 100644 --- a/telegram/inlinequeryresultaudio.py +++ b/telegram/inlinequeryresultaudio.py @@ -39,6 +39,14 @@ class InlineQueryResultAudio(InlineQueryResult): input_message_content (Optional[ :class:`telegram.input_message_content`]): + Deprecated: 4.0 + message_text (str): Use :class:`InputTextMessageContent` instead. + + parse_mode (str): Use :class:`InputTextMessageContent` instead. + + disable_web_page_preview (bool): Use :class:`InputTextMessageContent` + instead. + Args: audio_url (str): title (str): diff --git a/telegram/message.py b/telegram/message.py index 27e0cccd7..5d43f091b 100644 --- a/telegram/message.py +++ b/telegram/message.py @@ -62,6 +62,13 @@ class Message(TelegramObject): migrate_from_chat_id (int): channel_chat_created (bool): + Deprecated: 4.0 + new_chat_participant (:class:`telegram.User`): Use `new_chat_member` + instead. + + left_chat_participant (:class:`telegram.User`): Use `left_chat_member` + instead. + Args: message_id (int): from_user (:class:`telegram.User`):