From 7c3b970c486745adbee4053dabda671995fafe50 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Wed, 17 May 2023 22:02:24 +0200 Subject: [PATCH] remove Self references in shared code (as it is py3.11 only) --- music_assistant/common/models/config_entries.py | 6 +++--- music_assistant/common/models/enums.py | 4 ++-- music_assistant/common/models/media_items.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/music_assistant/common/models/config_entries.py b/music_assistant/common/models/config_entries.py index ab2bdd2d..1839da25 100644 --- a/music_assistant/common/models/config_entries.py +++ b/music_assistant/common/models/config_entries.py @@ -5,7 +5,7 @@ import logging from collections.abc import Iterable from dataclasses import dataclass from types import NoneType -from typing import Any, Self +from typing import Any from mashumaro import DataClassDictMixin @@ -157,10 +157,10 @@ class Config(DataClassDictMixin): @classmethod def parse( - cls: Self, + cls, config_entries: Iterable[ConfigEntry], raw: dict[str, Any], - ) -> Self: + ) -> Config: """Parse Config from the raw values (as stored in persistent storage).""" conf = cls.from_dict({**raw, "values": {}}) for entry in config_entries: diff --git a/music_assistant/common/models/enums.py b/music_assistant/common/models/enums.py index 17c65f2c..98a06973 100644 --- a/music_assistant/common/models/enums.py +++ b/music_assistant/common/models/enums.py @@ -2,7 +2,7 @@ from __future__ import annotations from enum import Enum -from typing import Any, Self, TypeVar +from typing import Any, TypeVar # pylint:disable=ungrouped-imports try: @@ -51,7 +51,7 @@ class MediaType(StrEnum): @classmethod @property - def ALL(cls: Self) -> tuple[MediaType, ...]: # noqa: N802 + def ALL(cls) -> tuple[MediaType, ...]: # noqa: N802 """Return all (default) MediaTypes as tuple.""" return ( MediaType.ARTIST, diff --git a/music_assistant/common/models/media_items.py b/music_assistant/common/models/media_items.py index 3aee5f78..55f1b193 100755 --- a/music_assistant/common/models/media_items.py +++ b/music_assistant/common/models/media_items.py @@ -4,7 +4,7 @@ from __future__ import annotations from collections.abc import Mapping from dataclasses import dataclass, field, fields from time import time -from typing import Any, Self +from typing import Any from mashumaro import DataClassDictMixin @@ -474,7 +474,7 @@ class PagedItems(DataClassDictMixin): total: int | None = None @classmethod - def parse(cls: Self, raw: dict[str, Any], item_type: type) -> PagedItems: + def parse(cls, raw: dict[str, Any], item_type: type) -> PagedItems: """Parse PagedItems object including correct item type.""" return PagedItems( items=[item_type.from_dict(x) for x in raw["items"]], -- 2.34.1