From a7a0ffbfc64d72b07bb4501ea780c0955ca1a2ac Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Thu, 16 Apr 2020 09:53:18 +0200 Subject: [PATCH] more fixing of imports --- music_assistant/models/__init__.py | 6 ------ music_assistant/musicproviders/qobuz.py | 4 ++-- music_assistant/musicproviders/spotify.py | 4 ++-- music_assistant/musicproviders/tunein.py | 3 ++- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/music_assistant/models/__init__.py b/music_assistant/models/__init__.py index 23c9b524..e69de29b 100644 --- a/music_assistant/models/__init__.py +++ b/music_assistant/models/__init__.py @@ -1,6 +0,0 @@ -from music_assistant.models.media_types import * -from music_assistant.models.musicprovider import MusicProvider -from music_assistant.models.player_queue import QueueItem, PlayerQueue -from music_assistant.models.player import Player -from music_assistant.models.playerstate import PlayerState -from music_assistant.models.playerprovider import PlayerProvider \ No newline at end of file diff --git a/music_assistant/musicproviders/qobuz.py b/music_assistant/musicproviders/qobuz.py index b952eb13..a961ef13 100644 --- a/music_assistant/musicproviders/qobuz.py +++ b/music_assistant/musicproviders/qobuz.py @@ -10,8 +10,8 @@ from asyncio_throttle import Throttler from music_assistant.utils import LOGGER, parse_title_and_version from music_assistant.app_vars import get_app_var -from music_assistant.models import MusicProvider, MediaType, TrackQuality, \ - AlbumType, Artist, Album, Track, Playlist +from music_assistant.models.media_types import MediaType, AlbumType, Artist, Album, Track, Playlist, TrackQuality +from music_assistant.models.musicprovider import MusicProvider from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, \ CONF_TYPE_PASSWORD, EVENT_STREAM_STARTED, EVENT_PLAYBACK_STOPPED diff --git a/music_assistant/musicproviders/spotify.py b/music_assistant/musicproviders/spotify.py index 1b53f1ec..b508f1f3 100644 --- a/music_assistant/musicproviders/spotify.py +++ b/music_assistant/musicproviders/spotify.py @@ -12,8 +12,8 @@ import aiohttp from music_assistant.utils import LOGGER, parse_title_and_version, json from music_assistant.app_vars import get_app_var -from music_assistant.models import MusicProvider, MediaType, TrackQuality, \ - AlbumType, Artist, Album, Track, Playlist +from music_assistant.models.media_types import MediaType, AlbumType, Artist, Album, Track, Playlist, TrackQuality +from music_assistant.models.musicprovider import MusicProvider from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD PROV_NAME = 'Spotify' diff --git a/music_assistant/musicproviders/tunein.py b/music_assistant/musicproviders/tunein.py index 1a812afc..65c3ff38 100644 --- a/music_assistant/musicproviders/tunein.py +++ b/music_assistant/musicproviders/tunein.py @@ -6,7 +6,8 @@ from asyncio_throttle import Throttler import aiohttp from music_assistant.utils import LOGGER -from music_assistant.models import MusicProvider, MediaType, TrackQuality, Radio +from music_assistant.models.media_types import MediaType, TrackQuality, Radio +from music_assistant.models.musicprovider import MusicProvider from music_assistant.constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED, CONF_TYPE_PASSWORD -- 2.34.1