From 0e5ac0a18181bc69c4e21e7af4c0783f331d0ecb Mon Sep 17 00:00:00 2001 From: Gleb Liutsko Date: Sat, 23 Nov 2019 14:56:48 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B5=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=BF=D1=87=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yandex_music/client.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yandex_music/client.py b/yandex_music/client.py index fa00c79..1397bab 100644 --- a/yandex_music/client.py +++ b/yandex_music/client.py @@ -86,7 +86,7 @@ class Client(YandexMusicObject): self.account = self.account_status().account @classmethod - def from_credentials(cls, username, password, x_captcha_answer=None, x_captcha_key=None, captch_callback=None, + def from_credentials(cls, username, password, x_captcha_answer=None, x_captcha_key=None, captcha_callback=None, *args, **kwargs): """Инициализция клиента по логину и паролю. @@ -98,7 +98,7 @@ class Client(YandexMusicObject): password (:obj:`str`): Пароль клиента (аутентификатор). x_captcha_answer (:obj:`str`, optional): Ответ на капчу (цифры с картинки). x_captcha_key (:obj:`str`, optional): Уникальный ключ капчи. - captch_callback (:obj:`function`, optional): Функция обратного вызова для обработки капчи, должна + captcha_callback (:obj:`function`, optional): Функция обратного вызова для обработки капчи, должна принимать объект класса :class:`yandex_music.exceptions.Captcha` и возвращать строку с кодом. **kwargs (:obj:`dict`, optional): Аргументы для конструктора клиента. @@ -106,18 +106,18 @@ class Client(YandexMusicObject): :obj:`yandex_music.Client`. """ - token = x_captcha_key = x_captcha_answer = None - if captch_callback: + token = None + if captcha_callback: while not token: try: token = cls().generate_token_by_username_and_password(username, password, x_captcha_answer=x_captcha_answer, - x_captcha_key=x_captcha_key, captch_callback=captch_callback) + x_captcha_key=x_captcha_key) except Captcha as e: - x_captcha_answer = captch_callback(e.captcha) + x_captcha_answer = captcha_callback(e.captcha) x_captcha_key = e.captcha.x_captcha_key else: token = cls().generate_token_by_username_and_password(username, password, x_captcha_answer=x_captcha_answer, - x_captcha_key=x_captcha_key, captch_callback=captch_callback) + x_captcha_key=x_captcha_key) return cls(token, *args, **kwargs)