From 134f3bcf0d68418dc14904cf165660c0a1d0eaca Mon Sep 17 00:00:00 2001 From: Il`ya Semyonov Date: Sun, 21 Jun 2020 22:17:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20MetaData=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BE=D0=BF=D1=86=D0=B8=D0=BE?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_meta_data.py | 7 +------ yandex_music/track/meta_data.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/test_meta_data.py b/tests/test_meta_data.py index a39b6ade..73987fac 100644 --- a/tests/test_meta_data.py +++ b/tests/test_meta_data.py @@ -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, diff --git a/yandex_music/track/meta_data.py b/yandex_music/track/meta_data.py index 692aaadd..1397c796 100644 --- a/yandex_music/track/meta_data.py +++ b/yandex_music/track/meta_data.py @@ -18,9 +18,9 @@ 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. @@ -28,17 +28,16 @@ class MetaData(YandexMusicObject): """ 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