From 4389e943e71c6d1c86f2814434073a5a46784da5 Mon Sep 17 00:00:00 2001 From: Il`ya Date: Sun, 19 Jan 2020 05:05:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A5=D0=BE=D1=82=D1=84=D0=BA=D0=B8=D1=81.=20?= =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B5=20picture=20=D0=B2=20vinyl=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B1=D1=8B=D1=82=D1=8C=20None?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/conftest.py | 2 +- tests/test_vinyl.py | 10 ++++------ yandex_music/artist/vinyl.py | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 098f9f2..79d7adf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -162,7 +162,7 @@ def video(): @pytest.fixture(scope='session') def vinyl(): - return Vinyl(TestVinyl.url, TestVinyl.picture, TestVinyl.title, TestVinyl.year, TestVinyl.price, TestVinyl.media) + return Vinyl(TestVinyl.url, TestVinyl.title, TestVinyl.year, TestVinyl.price, TestVinyl.media, TestVinyl.picture) @pytest.fixture(scope='session') diff --git a/tests/test_vinyl.py b/tests/test_vinyl.py index 6eabd2f..f523c99 100644 --- a/tests/test_vinyl.py +++ b/tests/test_vinyl.py @@ -24,12 +24,10 @@ class TestVinyl: assert Vinyl.de_list({}, client) == [] def test_de_json_required(self, client): - json_dict = {'url': self.url, 'picture': self.picture, 'title': self.title, 'year': self.year, - 'price': self.price, 'media': self.media} + json_dict = {'url': self.url, 'title': self.title, 'year': self.year, 'price': self.price, 'media': self.media} vinyl = Vinyl.de_json(json_dict, client) assert vinyl.url == self.url - assert vinyl.picture == self.picture assert vinyl.title == self.title assert vinyl.year == self.year assert vinyl.price == self.price @@ -48,9 +46,9 @@ class TestVinyl: assert vinyl.media == self.media def test_equality(self): - a = Vinyl(self.url, self.picture, self.title, 2020, 200, self.media) - b = Vinyl(self.url, self.picture, self.title, self.year, self.price, self.media) - c = Vinyl(self.url, self.picture, self.title, self.year, self.price, self.media) + a = Vinyl(self.url, self.title, 2020, 200, self.media, self.picture) + b = Vinyl(self.url, self.title, self.year, self.price, self.media, self.picture) + c = Vinyl(self.url, self.title, self.year, self.price, self.media, self.picture) assert a != b assert hash(a) != hash(b) diff --git a/yandex_music/artist/vinyl.py b/yandex_music/artist/vinyl.py index 262ac04..9685b72 100644 --- a/yandex_music/artist/vinyl.py +++ b/yandex_music/artist/vinyl.py @@ -9,11 +9,11 @@ from yandex_music import YandexMusicObject class Vinyl(YandexMusicObject): def __init__(self, url: str, - picture: str, title: str, year: int, price: int, media: str, + picture: Optional[str] = None, client: Optional['Client'] = None, **kwargs) -> None: self.url = url