mirror of
https://github.com/python-telegram-bot/python-telegram-bot.git
synced 2025-03-25 16:22:19 +01:00
Add missing docs utils (#912)
* add documentation for telegram.utils.promise and .request * improve documentation for telegram.utils.promise and .request * add missing 's' to new_chat_member(s) in all docstrings * fix docs for `set_chat_photo` [CI skip]
This commit is contained in:
parent
0811f566a2
commit
5956aae235
7 changed files with 55 additions and 3 deletions
|
@ -3,8 +3,8 @@ telegram package
|
||||||
|
|
||||||
.. toctree::
|
.. toctree::
|
||||||
|
|
||||||
telegram.utils.helpers
|
|
||||||
telegram.ext
|
telegram.ext
|
||||||
|
telegram.utils
|
||||||
telegram.audio
|
telegram.audio
|
||||||
telegram.bot
|
telegram.bot
|
||||||
telegram.callbackquery
|
telegram.callbackquery
|
||||||
|
|
6
docs/source/telegram.utils.promise.rst
Normal file
6
docs/source/telegram.utils.promise.rst
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
telegram.utils.promise.Promise
|
||||||
|
==============================
|
||||||
|
|
||||||
|
.. autoclass:: telegram.utils.promise.Promise
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
6
docs/source/telegram.utils.request.rst
Normal file
6
docs/source/telegram.utils.request.rst
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
telegram.utils.request.Request
|
||||||
|
==============================
|
||||||
|
|
||||||
|
.. autoclass:: telegram.utils.request.Request
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
8
docs/source/telegram.utils.rst
Normal file
8
docs/source/telegram.utils.rst
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
telegram.utils package
|
||||||
|
======================
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
|
||||||
|
telegram.utils.helpers
|
||||||
|
telegram.utils.promise
|
||||||
|
telegram.utils.request
|
|
@ -2639,7 +2639,7 @@ class Bot(TelegramObject):
|
||||||
Args:
|
Args:
|
||||||
chat_id (:obj:`int` | :obj:`str`): Unique identifier for the target chat or username
|
chat_id (:obj:`int` | :obj:`str`): Unique identifier for the target chat or username
|
||||||
of the target`channel (in the format @channelusername).
|
of the target`channel (in the format @channelusername).
|
||||||
photo (`telegram.InputFile`): New chat photo.
|
photo (`filelike object`): New chat photo.
|
||||||
timeout (:obj:`int` | :obj:`float`, optional): If this value is specified, use it as
|
timeout (:obj:`int` | :obj:`float`, optional): If this value is specified, use it as
|
||||||
the read timeout from the server (instead of the one specified during creation of
|
the read timeout from the server (instead of the one specified during creation of
|
||||||
the connection pool).
|
the connection pool).
|
||||||
|
|
|
@ -27,7 +27,20 @@ logger.addHandler(logging.NullHandler())
|
||||||
|
|
||||||
|
|
||||||
class Promise(object):
|
class Promise(object):
|
||||||
"""A simple Promise implementation for the run_async decorator."""
|
"""A simple Promise implementation for use with the run_async decorator, DelayQueue etc.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
pooled_function (:obj:`callable`): The callable that will be called concurrently.
|
||||||
|
args (:obj:`list` | :obj:`tuple`): Positional arguments for :attr:`pooled_function`.
|
||||||
|
kwargs (:obj:`dict`): Keyword arguments for :attr:`pooled_function`.
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
pooled_function (:obj:`callable`): The callable that will be called concurrently.
|
||||||
|
args (:obj:`list` | :obj:`tuple`): Positional arguments for :attr:`pooled_function`.
|
||||||
|
kwargs (:obj:`dict`): Keyword arguments for :attr:`pooled_function`.
|
||||||
|
done (:obj:`threading.Event`): Is set when the result is available.
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, pooled_function, args, kwargs):
|
def __init__(self, pooled_function, args, kwargs):
|
||||||
self.pooled_function = pooled_function
|
self.pooled_function = pooled_function
|
||||||
|
@ -38,6 +51,8 @@ class Promise(object):
|
||||||
self._exception = None
|
self._exception = None
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
|
"""Calls the :attr:`pooled_function` callable."""
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._result = self.pooled_function(*self.args, **self.kwargs)
|
self._result = self.pooled_function(*self.args, **self.kwargs)
|
||||||
|
|
||||||
|
@ -52,6 +67,19 @@ class Promise(object):
|
||||||
self.run()
|
self.run()
|
||||||
|
|
||||||
def result(self, timeout=None):
|
def result(self, timeout=None):
|
||||||
|
"""Return the result of the ``Promise``.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
timeout (:obj:`float`, optional): Maximum time in seconds to wait for the result to be
|
||||||
|
calculated. ``None`` means indefinite. Default is ``None``.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Returns the return value of :attr:`pooled_function` or ``None`` if the ``timeout``
|
||||||
|
expires.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
Any exception raised by :attr:`pooled_function`.
|
||||||
|
"""
|
||||||
self.done.wait(timeout=timeout)
|
self.done.wait(timeout=timeout)
|
||||||
if self._exception is not None:
|
if self._exception is not None:
|
||||||
raise self._exception # pylint: disable=raising-bad-type
|
raise self._exception # pylint: disable=raising-bad-type
|
||||||
|
@ -59,4 +87,6 @@ class Promise(object):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def exception(self):
|
def exception(self):
|
||||||
|
"""The exception raised by :attr:`pooled_function` or ``None`` if no exception has been
|
||||||
|
raised (yet)."""
|
||||||
return self._exception
|
return self._exception
|
||||||
|
|
|
@ -242,6 +242,7 @@ class Request(object):
|
||||||
|
|
||||||
def post(self, url, data, timeout=None):
|
def post(self, url, data, timeout=None):
|
||||||
"""Request an URL.
|
"""Request an URL.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
url (:obj:`str`): The web location we want to retrieve.
|
url (:obj:`str`): The web location we want to retrieve.
|
||||||
data (dict[str, str|int]): A dict of key/value pairs. Note: On py2.7 value is unicode.
|
data (dict[str, str|int]): A dict of key/value pairs. Note: On py2.7 value is unicode.
|
||||||
|
@ -291,6 +292,7 @@ class Request(object):
|
||||||
|
|
||||||
def download(self, url, filename, timeout=None):
|
def download(self, url, filename, timeout=None):
|
||||||
"""Download a file by its URL.
|
"""Download a file by its URL.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
url (str): The web location we want to retrieve.
|
url (str): The web location we want to retrieve.
|
||||||
timeout (:obj:`int` | :obj:`float`): If this value is specified, use it as the read
|
timeout (:obj:`int` | :obj:`float`): If this value is specified, use it as the read
|
||||||
|
|
Loading…
Add table
Reference in a new issue