From 86ff50df373f03f10aa2ec088244f455321271ff Mon Sep 17 00:00:00 2001 From: Il`ya Date: Sun, 22 Mar 2020 17:16:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D1=81=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D0=BC=D0=BE=D0=B5=20=D0=B8=D1=81=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82=D0=B5.=20=D0=94?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/source/yandex_music.exceptions.rst | 53 +++++++++++++++++++++++++ docs/source/yandex_music.rst | 1 + yandex_music/utils/request.py | 10 ++--- 3 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 docs/source/yandex_music.exceptions.rst diff --git a/docs/source/yandex_music.exceptions.rst b/docs/source/yandex_music.exceptions.rst new file mode 100644 index 0000000..6ab8d7f --- /dev/null +++ b/docs/source/yandex_music.exceptions.rst @@ -0,0 +1,53 @@ +yandex_music.exceptions +======================= + +.. autoclass:: yandex_music.exceptions.YandexMusicError + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.InvalidToken + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.Unauthorized + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.InvalidBitrate + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.Captcha + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.CaptchaRequired + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.CaptchaWrong + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.NetworkError + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.BadRequest + :members: + :undoc-members: + :show-inheritance: + +.. autoclass:: yandex_music.exceptions.TimedOut + :members: + :undoc-members: + :show-inheritance: + diff --git a/docs/source/yandex_music.rst b/docs/source/yandex_music.rst index 8b400c5..6d075ad 100644 --- a/docs/source/yandex_music.rst +++ b/docs/source/yandex_music.rst @@ -8,6 +8,7 @@ yandex_music.cover yandex_music.download_info yandex_music.experiments + yandex_music.exceptions yandex_music.icon yandex_music.invocation_info yandex_music.pager diff --git a/yandex_music/utils/request.py b/yandex_music/utils/request.py index e8666c5..649d678 100644 --- a/yandex_music/utils/request.py +++ b/yandex_music/utils/request.py @@ -14,7 +14,7 @@ import requests from yandex_music.utils.captcha_response import CaptchaResponse from yandex_music.utils.response import Response from yandex_music.exceptions import Unauthorized, BadRequest, NetworkError, YandexMusicError, CaptchaRequired, \ - CaptchaWrong + CaptchaWrong, TimedOut if TYPE_CHECKING: from yandex_music import Client @@ -164,7 +164,7 @@ class Request: :obj:`yandex_music.utils.response.Response`: Ответ API. Raises: - :class:`TimeoutError`: При превышении времени ожидания. + :class:`yandex_music.exceptions.TimedOut`: При превышении времени ожидания. :class:`yandex_music.exceptions.Unauthorized`: При невалидном токене, долгом ожидании прямой ссылки на файл. :class:`yandex_music.exceptions.BadRequest`: При неправильном запросе. :class:`yandex_music.exceptions.NetworkError`: При проблемах с сетью. @@ -179,7 +179,7 @@ class Request: try: resp = requests.request(*args, **kwargs) except requests.Timeout: - raise TimeoutError() + raise TimedOut() except requests.RequestException as e: raise NetworkError(e) @@ -219,7 +219,6 @@ class Request: :obj:`yandex_music.utils.response.Response`: Ответ API. Raises: - :class:`TimeoutError`: При превышении времени ожидания. :class:`yandex_music.exceptions.YandexMusicError`: Базовое исключение библиотеки. """ result = self._request_wrapper('GET', url, params=params, headers=self.headers, proxies=self.proxies, @@ -242,7 +241,6 @@ class Request: :obj:`yandex_music.utils.response.Response`: Ответ API. Raises: - :class:`TimeoutError`: При превышении времени ожидания. :class:`yandex_music.exceptions.YandexMusicError`: Базовое исключение библиотеки. """ result = self._request_wrapper('POST', url, headers=self.headers, proxies=self.proxies, data=data, @@ -264,7 +262,6 @@ class Request: :obj:`Response`: Экземляр объекта ответа библиотеки `requests`. Raises: - :class:`TimeoutError`: При превышении времени ожидания. :class:`yandex_music.exceptions.YandexMusicError`: Базовое исключение библиотеки. """ return self._request_wrapper('GET', url, proxies=self.proxies, timeout=timeout, *args, **kwargs) @@ -281,7 +278,6 @@ class Request: **kwargs: Произвольные ключевые аргументы для `requests.request`. Raises: - :class:`TimeoutError`: При превышении времени ожидания. :class:`yandex_music.exceptions.YandexMusicError`: Базовое исключение библиотеки. """ result = self.retrieve(url, timeout=timeout, *args, *kwargs)