Поле advertisement класса Status теперь опциональное
このコミットが含まれているのは:
コミット
77f77a0e6f
|
@ -29,13 +29,11 @@ class TestStatus:
|
||||||
assert Status.de_json({}, client) is None
|
assert Status.de_json({}, client) is None
|
||||||
|
|
||||||
def test_de_json_required(self, client, account, permissions):
|
def test_de_json_required(self, client, account, permissions):
|
||||||
json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict(),
|
json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict()}
|
||||||
'advertisement': self.advertisement}
|
|
||||||
status = Status.de_json(json_dict, client)
|
status = Status.de_json(json_dict, client)
|
||||||
|
|
||||||
assert status.account == account
|
assert status.account == account
|
||||||
assert status.permissions == permissions
|
assert status.permissions == permissions
|
||||||
assert status.advertisement == self.advertisement
|
|
||||||
|
|
||||||
def test_de_json_all(self, client, account, permissions, subscription, plus):
|
def test_de_json_all(self, client, account, permissions, subscription, plus):
|
||||||
json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict(),
|
json_dict = {'account': account.to_dict(), 'permissions': permissions.to_dict(),
|
||||||
|
@ -60,9 +58,9 @@ class TestStatus:
|
||||||
assert status.premium_region == self.premium_region
|
assert status.premium_region == self.premium_region
|
||||||
|
|
||||||
def test_equality(self, account, permissions, subscription):
|
def test_equality(self, account, permissions, subscription):
|
||||||
a = Status(account, permissions, self.advertisement)
|
a = Status(account, permissions)
|
||||||
b = Status(None, permissions, '')
|
b = Status(None, permissions)
|
||||||
c = Status(account, permissions, self.advertisement)
|
c = Status(account, permissions)
|
||||||
|
|
||||||
assert a != b
|
assert a != b
|
||||||
assert hash(a) != hash(b)
|
assert hash(a) != hash(b)
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Status(YandexMusicObject):
|
||||||
Args:
|
Args:
|
||||||
account (:obj:`yandex_music.Account`): Основная информация об аккаунте
|
account (:obj:`yandex_music.Account`): Основная информация об аккаунте
|
||||||
permissions (:obj:`yandex_music.Permissions`): Информация о правах пользователя.
|
permissions (:obj:`yandex_music.Permissions`): Информация о правах пользователя.
|
||||||
advertisement (:obj:`str`): Рекламное объявление.
|
advertisement (:obj:`str`, optional): Рекламное объявление.
|
||||||
subscription (:obj:`yandex_music.Subscription`, optional): Информация о подписках.
|
subscription (:obj:`yandex_music.Subscription`, optional): Информация о подписках.
|
||||||
cache_limit (:obj:`int`, optional): Максимальное количество загруженных треков.
|
cache_limit (:obj:`int`, optional): Максимальное количество загруженных треков.
|
||||||
subeditor (:obj:`bool`, optional): Наличие статуса модератора проверки корректности информации.
|
subeditor (:obj:`bool`, optional): Наличие статуса модератора проверки корректности информации.
|
||||||
|
@ -44,7 +44,7 @@ class Status(YandexMusicObject):
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
account: Optional['Account'],
|
account: Optional['Account'],
|
||||||
permissions: Optional['Permissions'],
|
permissions: Optional['Permissions'],
|
||||||
advertisement: str,
|
advertisement: Optional[str] = None,
|
||||||
subscription: Optional['Subscription'] = None,
|
subscription: Optional['Subscription'] = None,
|
||||||
cache_limit: Optional[int] = None,
|
cache_limit: Optional[int] = None,
|
||||||
subeditor: Optional[bool] = None,
|
subeditor: Optional[bool] = None,
|
||||||
|
@ -58,8 +58,8 @@ class Status(YandexMusicObject):
|
||||||
**kwargs) -> None:
|
**kwargs) -> None:
|
||||||
self.account = account
|
self.account = account
|
||||||
self.permissions = permissions
|
self.permissions = permissions
|
||||||
self.advertisement = advertisement
|
|
||||||
|
|
||||||
|
self.advertisement = advertisement
|
||||||
self.subscription = subscription
|
self.subscription = subscription
|
||||||
self.cache_limit = cache_limit
|
self.cache_limit = cache_limit
|
||||||
self.subeditor = subeditor
|
self.subeditor = subeditor
|
||||||
|
@ -71,7 +71,7 @@ class Status(YandexMusicObject):
|
||||||
self.premium_region = premium_region
|
self.premium_region = premium_region
|
||||||
|
|
||||||
self.client = client
|
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)
|
super().handle_unknown_kwargs(self, **kwargs)
|
||||||
|
|
||||||
|
|
読み込み中…
新しいイシューから参照