From 7bb228908edb3df89b3e6bf1b55180f7851d1783 Mon Sep 17 00:00:00 2001 From: Il`ya Semyonov Date: Tue, 24 Mar 2020 10:49:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D1=81=20=D1=81=D1=81=D1=8B?= =?UTF-8?q?=D0=BB=D0=BA=D0=BE=D0=B9=20=D0=BD=D0=B0=20=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=20=D0=B2=20=D0=BA=D0=BB=D0=B0?= =?UTF-8?q?=D1=81=D1=81=D0=B5=20Description?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/conftest.py | 2 +- tests/test_description.py | 18 +++++++++--------- yandex_music/artist/description.py | 11 ++++++----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6ba0c63..7c1b923 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -217,7 +217,7 @@ def counts(): @pytest.fixture(scope='session') def description(): - return Description(TestDescription.text, TestDescription.url) + return Description(TestDescription.text, TestDescription.uri) @pytest.fixture(scope='session') diff --git a/tests/test_description.py b/tests/test_description.py index 4975285..5de3daf 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -5,34 +5,34 @@ class TestDescription: text = 'Американский певец и актёр, один из самых коммерчески успешных исполнителей популярной музыки XX века. ' \ 'Также известен как «король рок-н-ролла». Пресли популяризовал рок-н-ролл, хотя и не был первым ' \ 'исполнителем этого жанра. ' - url = 'http://ru.wikipedia.org/wiki/Пресли, Элвис' + uri = 'http://ru.wikipedia.org/wiki/Пресли, Элвис' def test_expected_values(self, description): assert description.text == self.text - assert description.url == self.url + assert description.uri == self.uri def test_de_json_none(self, client): assert Description.de_json({}, client) is None def test_de_json_required(self, client): - json_dict = {'text': self.text, 'url': self.url} + json_dict = {'text': self.text, 'uri': self.uri} description = Description.de_json(json_dict, client) assert description.text == self.text - assert description.url == self.url + assert description.uri == self.uri def test_de_json_all(self, client): - json_dict = {'text': self.text, 'url': self.url} + json_dict = {'text': self.text, 'uri': self.uri} description = Description.de_json(json_dict, client) assert description.text == self.text - assert description.url == self.url + assert description.uri == self.uri def test_equality(self): - a = Description(self.text, self.url) - b = Description('', self.url) + a = Description(self.text, self.uri) + b = Description('', self.uri) c = Description(self.text, '') - d = Description(self.text, self.url) + d = Description(self.text, self.uri) assert a != b != c assert hash(a) != hash(b) != hash(c) diff --git a/yandex_music/artist/description.py b/yandex_music/artist/description.py index 0f0385b..cd773e5 100644 --- a/yandex_music/artist/description.py +++ b/yandex_music/artist/description.py @@ -15,26 +15,27 @@ class Description(YandexMusicObject): Attributes: text (:obj:`str`): Описание исполнителя. - url (:obj:`str`): Ссылка на источник. + uri (:obj:`str`): Ссылка на источник. client (:obj:`yandex_music.Client`): Клиент Yandex Music. Args: text (:obj:`str`): Описание исполнителя. - url (:obj:`str`): Ссылка на источник. + uri (:obj:`str`): Ссылка на источник. client (:obj:`yandex_music.Client`, optional): Клиент Yandex Music. **kwargs: Произвольные ключевые аргументы полученные от API. """ def __init__(self, text: str, - url: str, + uri: str, client: Optional['Client'] = None, **kwargs) -> None: self.text = text - self.url = url + + self.uri = uri self.client = client - self._id_attrs = (self.text, self.url) + self._id_attrs = (self.text, self.uri) @classmethod def de_json(cls, data: dict, client: 'Client') -> Optional['Description']: