Skip to content

Commit

Permalink
Все поля класса MetaData теперь опциональные
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshalX committed Jun 21, 2020
1 parent 4a57ce3 commit 134f3bc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
7 changes: 1 addition & 6 deletions tests/test_meta_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ def test_de_json_none(self, client):
assert MetaData.de_json({}, client) is None

def test_de_json_required(self, client):
json_dict = {'album': self.album, 'volume': self.volume, 'year': self.year}
meta_data = MetaData.de_json(json_dict, client)

assert meta_data.album == self.album
assert meta_data.volume == self.volume
assert meta_data.year == self.year
MetaData.de_json({}, client)

def test_de_json_all(self, client):
json_dict = {'album': self.album, 'volume': self.volume, 'year': self.year,
Expand Down
17 changes: 8 additions & 9 deletions yandex_music/track/meta_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,26 @@ class MetaData(YandexMusicObject):
client (:obj:`yandex_music.Client`): Клиент Yandex Music.
Args:
album (:obj:`str`): Название альбома.
volume (:obj:`int`): Диск (раздел).
year (:obj:`int`): Год выхода.
album (:obj:`str`, optional): Название альбома.
volume (:obj:`int`, optional): Диск (раздел).
year (:obj:`int`, optional): Год выхода.
number (:obj:`int`, optional): Позиция в альбоме.
genre (:obj:`str`, optional): Жанр.
client (:obj:`yandex_music.Client`, optional): Клиент Yandex Music.
**kwargs: Произвольные ключевые аргументы полученные от API.
"""

def __init__(self,
album: str,
volume: int,
year: int,
number: int = None,
genre: str = None,
album: Optional[str] = None,
volume: Optional[int] = None,
year: Optional[int] = None,
number: Optional[int] = None,
genre: Optional[str] = None,
client: Optional['Client'] = None,
**kwargs) -> None:
self.album = album
self.volume = volume
self.year = year

self.number = number
self.genre = genre

Expand Down

0 comments on commit 134f3bc

Please sign in to comment.