diff --git a/tests/conftest.py b/tests/conftest.py index 19a55d7..35245d8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -346,7 +346,7 @@ def case_forms(): @pytest.fixture(scope='session') def lyrics(): return Lyrics(TestLyrics.id, TestLyrics.lyrics, TestLyrics.full_lyrics, TestLyrics.has_rights, - TestLyrics.text_language, TestLyrics.show_translation, TestLyrics.url) + TestLyrics.show_translation, TestLyrics.text_language, TestLyrics.url) @pytest.fixture(scope='session') diff --git a/tests/test_lyrics.py b/tests/test_lyrics.py index ddbb2b7..ff05959 100644 --- a/tests/test_lyrics.py +++ b/tests/test_lyrics.py @@ -39,15 +39,13 @@ class TestLyrics: def test_de_json_required(self, client): json_dict = {'id_': self.id, 'lyrics': self.lyrics, 'full_lyrics': self.full_lyrics, - 'has_rights': self.has_rights, 'text_language': self.text_language, - 'show_translation': self.show_translation} + 'has_rights': self.has_rights, 'show_translation': self.show_translation} lyrics = Lyrics.de_json(json_dict, client) assert lyrics.id == self.id assert lyrics.lyrics == self.lyrics assert lyrics.full_lyrics == self.full_lyrics assert lyrics.has_rights == self.has_rights - assert lyrics.text_language == self.text_language assert lyrics.show_translation == self.show_translation def test_de_json_all(self, client): diff --git a/tests/test_video_supplement.py b/tests/test_video_supplement.py index 3ba8739..8edfc2e 100644 --- a/tests/test_video_supplement.py +++ b/tests/test_video_supplement.py @@ -28,14 +28,12 @@ class TestVideoSupplement: assert VideoSupplement.de_list({}, client) == [] def test_de_json_required(self, client): - json_dict = {'cover': self.cover, 'title': self.title, 'provider': self.provider, - 'provider_video_id': self.provider_video_id} + json_dict = {'cover': self.cover, 'title': self.title, 'provider': self.provider} video_supplement = VideoSupplement.de_json(json_dict, client) assert video_supplement.cover == self.cover assert video_supplement.title == self.title assert video_supplement.provider == self.provider - assert video_supplement.provider_video_id == self.provider_video_id def test_de_json_all(self, client): json_dict = {'cover': self.cover, 'title': self.title, 'provider': self.provider, diff --git a/yandex_music/supplement/lyrics.py b/yandex_music/supplement/lyrics.py index 85c89de..3aab491 100644 --- a/yandex_music/supplement/lyrics.py +++ b/yandex_music/supplement/lyrics.py @@ -24,8 +24,8 @@ class Lyrics(YandexMusicObject): lyrics (:obj:`str`): Первые строки текст песни. has_rights (:obj:`bool`): Есть ли права. full_lyrics (:obj:`str`): Текст песни. - text_language (:obj:`str`): Язык песни. show_translation (:obj:`bool`): Доступен ли перевод. + text_language (:obj:`str`, optional): Язык песни. url (:obj:`str`, optional): Ссылка на источник перевода. Обычно genius.com. client (:obj:`yandex_music.Client`, optional): Клиент Yandex Music. **kwargs: Произвольные ключевые аргументы полученные от API. @@ -36,8 +36,8 @@ class Lyrics(YandexMusicObject): lyrics: str, full_lyrics: str, has_rights: bool, - text_language: str, show_translation: bool, + text_language: Optional[str] = None, url: Optional[str] = None, client: Optional['Client'] = None, **kwargs) -> None: @@ -45,9 +45,9 @@ class Lyrics(YandexMusicObject): self.lyrics = lyrics self.full_lyrics = full_lyrics self.has_rights = has_rights - self.text_language = text_language self.show_translation = show_translation + self.text_language = text_language self.url = url self.client = client diff --git a/yandex_music/supplement/video_supplement.py b/yandex_music/supplement/video_supplement.py index 4a87d94..e2a6660 100644 --- a/yandex_music/supplement/video_supplement.py +++ b/yandex_music/supplement/video_supplement.py @@ -23,10 +23,10 @@ class VideoSupplement(YandexMusicObject): cover (:obj:`str`): URL на обложку видео. title (:obj:`str`): Название видео. provider (:obj:`str`): Сервис поставляющий видео. - provider_video_id (:obj:`str`): Уникальный идентификатор видео на сервисе. - url (:obj:`str`): URL на видео. - embed_url (:obj:`str`): URL на видео, находящегося на серверах Яндекса. - embed (:obj:`str`): HTML тег для встраивания видео. + provider_video_id (:obj:`str`, optional): Уникальный идентификатор видео на сервисе. + url (:obj:`str`, optional): URL на видео. + embed_url (:obj:`str`, optional): URL на видео, находящегося на серверах Яндекса. + embed (:obj:`str`, optional): HTML тег для встраивания видео. client (:obj:`yandex_music.Client`, optional): Клиент Yandex Music. **kwargs: Произвольные ключевые аргументы полученные от API. """ @@ -35,7 +35,7 @@ class VideoSupplement(YandexMusicObject): cover: str, title: str, provider: str, - provider_video_id: str, + provider_video_id: Optional[str] = None, url: Optional[str] = None, embed_url: Optional[str] = None, embed: Optional[str] = None, @@ -44,8 +44,8 @@ class VideoSupplement(YandexMusicObject): self.cover = cover self.title = title self.provider = provider - self.provider_video_id = provider_video_id + self.provider_video_id = provider_video_id self.url = url self.embed_url = embed_url self.embed = embed