From 77f77a0e6f1ab216204aa05fd4642832f95e1c6b Mon Sep 17 00:00:00 2001 From: Il`ya Semyonov Date: Sat, 6 Jun 2020 11:45:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B5=20advertisement=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20Status=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BE=D0=BF=D1=86=D0=B8=D0=BE=D0=BD?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_status.py | 10 ++++------ yandex_music/account/status.py | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/test_status.py b/tests/test_status.py index ea43c80..9566ce0 100644 --- a/tests/test_status.py +++ b/tests/test_status.py @@ -29,13 +29,11 @@ class TestStatus: assert Status.de_json({}, client) is None def test_de_json_required(self, client, account, permissions): - json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict(), - 'advertisement': self.advertisement} + json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict()} status = Status.de_json(json_dict, client) assert status.account == account assert status.permissions == permissions - assert status.advertisement == self.advertisement def test_de_json_all(self, client, account, permissions, subscription, plus): json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict(), @@ -60,9 +58,9 @@ class TestStatus: assert status.premium_region == self.premium_region def test_equality(self, account, permissions, subscription): - a = Status(account, permissions, self.advertisement) - b = Status(None, permissions, '') - c = Status(account, permissions, self.advertisement) + a = Status(account, permissions) + b = Status(None, permissions) + c = Status(account, permissions) assert a != b assert hash(a) != hash(b) diff --git a/yandex_music/account/status.py b/yandex_music/account/status.py index dbac36e..884c39b 100644 --- a/yandex_music/account/status.py +++ b/yandex_music/account/status.py @@ -27,7 +27,7 @@ class Status(YandexMusicObject): Args: account (:obj:`yandex_music.Account`): Основная информация об аккаунте permissions (:obj:`yandex_music.Permissions`): Информация о правах пользователя. - advertisement (:obj:`str`): Рекламное объявление. + advertisement (:obj:`str`, optional): Рекламное объявление. subscription (:obj:`yandex_music.Subscription`, optional): Информация о подписках. cache_limit (:obj:`int`, optional): Максимальное количество загруженных треков. subeditor (:obj:`bool`, optional): Наличие статуса модератора проверки корректности информации. @@ -44,7 +44,7 @@ class Status(YandexMusicObject): def __init__(self, account: Optional['Account'], permissions: Optional['Permissions'], - advertisement: str, + advertisement: Optional[str] = None, subscription: Optional['Subscription'] = None, cache_limit: Optional[int] = None, subeditor: Optional[bool] = None, @@ -58,8 +58,8 @@ class Status(YandexMusicObject): **kwargs) -> None: self.account = account self.permissions = permissions - self.advertisement = advertisement + self.advertisement = advertisement self.subscription = subscription self.cache_limit = cache_limit self.subeditor = subeditor @@ -71,7 +71,7 @@ class Status(YandexMusicObject): self.premium_region = premium_region self.client = client - self._id_attrs = (self.account, self.permissions, self.advertisement) + self._id_attrs = (self.account, self.permissions) super().handle_unknown_kwargs(self, **kwargs)