Use root import for media_player and media_source (#125828)

* Use root import for media_player and media_source

* One more

homeassistant/components/androidtv_remote/media_player.py

@@ -8,6 +8,7 @@ from typing import Any
 from androidtvremote2 import AndroidTVRemote, ConnectionClosed
 
 from homeassistant.components.media_player import (
+    BrowseMedia,
     MediaClass,
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
@@ -15,7 +16,6 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.components.media_player.browse_media import BrowseMedia
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback

homeassistant/components/arcam_fmj/media_player.py

@@ -11,6 +11,7 @@ from arcam.fmj import ConnectionFailed, SourceCodes
 from arcam.fmj.state import State
 
 from homeassistant.components.media_player import (
+    BrowseError,
     BrowseMedia,
     MediaClass,
     MediaPlayerEntity,
@@ -18,7 +19,6 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.components.media_player.errors import BrowseError
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError

homeassistant/components/braviatv/media_player.py

@@ -7,6 +7,7 @@ from typing import Any
 
 from homeassistant.components.media_player import (
     BrowseError,
+    BrowseMedia,
     MediaClass,
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
@@ -14,7 +15,6 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.components.media_player.browse_media import BrowseMedia
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 

homeassistant/components/camera/media_source.py

@@ -5,12 +5,12 @@ from __future__ import annotations
 import asyncio
 
 from homeassistant.components.media_player import BrowseError, MediaClass
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.components.stream import FORMAT_CONTENT_TYPE, HLS_PROVIDER
 from homeassistant.const import ATTR_FRIENDLY_NAME

homeassistant/components/dlna_dms/dms.py

@@ -20,8 +20,11 @@ from didl_lite import didl_lite
 
 from homeassistant.components import ssdp
 from homeassistant.components.media_player import BrowseError, MediaClass
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import BrowseMediaSource, PlayMedia
+    BrowseMediaSource,
+    PlayMedia,
+    Unresolvable,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_ID, CONF_URL
 from homeassistant.core import HomeAssistant, callback

homeassistant/components/dlna_dms/media_source.py

@@ -13,11 +13,11 @@ Media identifiers can look like:
 from __future__ import annotations
 
 from homeassistant.components.media_player import BrowseError, MediaClass, MediaType
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,
+    Unresolvable,
 )
 from homeassistant.core import HomeAssistant
 

homeassistant/components/forked_daapd/browse_media.py

@@ -7,8 +7,12 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, cast
 from urllib.parse import quote, unquote
 
-from homeassistant.components.media_player import BrowseMedia, MediaClass, MediaType
+from homeassistant.components.media_player import (
-from homeassistant.components.media_player.errors import BrowseError
+    BrowseError,
+    BrowseMedia,
+    MediaClass,
+    MediaType,
+)
 from homeassistant.helpers.network import is_internal_request
 
 from .const import CAN_PLAY_TYPE, URI_SCHEMA

homeassistant/components/image/media_source.py

@@ -5,12 +5,12 @@ from __future__ import annotations
 from typing import cast
 
 from homeassistant.components.media_player import BrowseError, MediaClass
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.const import ATTR_FRIENDLY_NAME
 from homeassistant.core import HomeAssistant, State

homeassistant/components/jellyfin/browse_media.py

@@ -7,8 +7,12 @@ from typing import Any
 
 from jellyfin_apiclient_python import JellyfinClient
 
-from homeassistant.components.media_player import BrowseError, MediaClass, MediaType
+from homeassistant.components.media_player import (
-from homeassistant.components.media_player.browse_media import BrowseMedia
+    BrowseError,
+    BrowseMedia,
+    MediaClass,
+    MediaType,
+)
 from homeassistant.core import HomeAssistant
 
 from .client_wrapper import get_artwork_url

homeassistant/components/jellyfin/media_player.py

@@ -5,13 +5,13 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.media_player import (
+    BrowseMedia,
     MediaPlayerEntity,
     MediaPlayerEntityDescription,
     MediaPlayerEntityFeature,
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.components.media_player.browse_media import BrowseMedia
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback

homeassistant/components/jellyfin/media_source.py

@@ -11,7 +11,7 @@ from jellyfin_apiclient_python.api import jellyfin_url
 from jellyfin_apiclient_python.client import JellyfinClient
 
 from homeassistant.components.media_player import BrowseError, MediaClass
-from homeassistant.components.media_source.models import (
+from homeassistant.components.media_source import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,

homeassistant/components/linkplay/media_player.py

@@ -20,8 +20,6 @@ from homeassistant.components.media_player import (
     MediaPlayerState,
     MediaType,
     RepeatMode,
-)
-from homeassistant.components.media_player.browse_media import (
     async_process_play_media_url,
 )
 from homeassistant.core import HomeAssistant

homeassistant/components/media_source/__init__.py

@@ -13,8 +13,6 @@ from homeassistant.components.media_player import (
     CONTENT_AUTH_EXPIRY_TIME,
     BrowseError,
     BrowseMedia,
-)
-from homeassistant.components.media_player.browse_media import (
     async_process_play_media_url,
 )
 from homeassistant.components.websocket_api import ActiveConnection

homeassistant/components/motioneye/media_source.py

@@ -9,12 +9,13 @@ from typing import cast
 from motioneye_client.const import KEY_MEDIA_LIST, KEY_MIME_TYPE, KEY_PATH
 
 from homeassistant.components.media_player import MediaClass, MediaType
-from homeassistant.components.media_source.error import MediaSourceError, Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
+    MediaSourceError,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback

homeassistant/components/nest/media_source.py

@@ -37,12 +37,12 @@ from google_nest_sdm.transcoder import Transcoder
 
 from homeassistant.components.ffmpeg import get_ffmpeg_manager
 from homeassistant.components.media_player import BrowseError, MediaClass, MediaType
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr

homeassistant/components/netatmo/media_source.py

@@ -7,12 +7,13 @@ import logging
 import re
 
 from homeassistant.components.media_player import BrowseError, MediaClass, MediaType
-from homeassistant.components.media_source.error import MediaSourceError, Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
+    MediaSourceError,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.core import HomeAssistant, callback
 

homeassistant/components/radio_browser/media_source.py

@@ -8,12 +8,12 @@ from radios import FilterBy, Order, RadioBrowser, Station
 from radios.radio_browser import pycountry
 
 from homeassistant.components.media_player import MediaClass, MediaType
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.core import HomeAssistant, callback
 

homeassistant/components/reolink/media_source.py

@@ -10,12 +10,12 @@ from reolink_aio.enums import VodRequestType
 
 from homeassistant.components.camera import DOMAIN as CAM_DOMAIN, DynamicStreamSettings
 from homeassistant.components.media_player import MediaClass, MediaType
-from homeassistant.components.media_source.error import Unresolvable
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,
     PlayMedia,
+    Unresolvable,
 )
 from homeassistant.components.stream import create_stream
 from homeassistant.config_entries import ConfigEntryState

homeassistant/components/roon/media_browser.py

@@ -2,8 +2,7 @@
 
 import logging
 
-from homeassistant.components.media_player import BrowseMedia, MediaClass
+from homeassistant.components.media_player import BrowseError, BrowseMedia, MediaClass
-from homeassistant.components.media_player.errors import BrowseError
 
 
 class UnknownMediaType(BrowseError):

homeassistant/components/sonos/exception.py

@@ -1,6 +1,6 @@
 """Sonos specific exceptions."""
 
-from homeassistant.components.media_player.errors import BrowseError
+from homeassistant.components.media_player import BrowseError
 from homeassistant.exceptions import HomeAssistantError
 
 

homeassistant/components/system_bridge/media_source.py

@@ -7,8 +7,9 @@ from systembridgemodels.media_files import MediaFile, MediaFiles
 from systembridgemodels.media_get_files import MediaGetFiles
 
 from homeassistant.components.media_player import MediaClass
-from homeassistant.components.media_source import MEDIA_CLASS_MAP, MEDIA_MIME_TYPES
+from homeassistant.components.media_source import (
-from homeassistant.components.media_source.models import (
+    MEDIA_CLASS_MAP,
+    MEDIA_MIME_TYPES,
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,

homeassistant/components/unifiprotect/media_source.py

@@ -14,7 +14,7 @@ from yarl import URL
 
 from homeassistant.components.camera import CameraImageView
 from homeassistant.components.media_player import BrowseError, MediaClass
-from homeassistant.components.media_source.models import (
+from homeassistant.components.media_source import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,

homeassistant/components/universal/media_player.py

@@ -41,13 +41,13 @@ from homeassistant.components.media_player import (
     SERVICE_PLAY_MEDIA,
     SERVICE_SELECT_SOUND_MODE,
     SERVICE_SELECT_SOURCE,
+    BrowseMedia,
     MediaPlayerEntity,
     MediaPlayerEntityFeature,
     MediaPlayerState,
     MediaType,
     RepeatMode,
 )
-from homeassistant.components.media_player.browse_media import BrowseMedia
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
     ATTR_ENTITY_ID,

homeassistant/components/xbox/media_source.py

@@ -13,7 +13,7 @@ from xbox.webapi.api.provider.screenshots.models import ScreenshotResponse
 from xbox.webapi.api.provider.smartglass.models import InstalledPackage
 
 from homeassistant.components.media_player import MediaClass
-from homeassistant.components.media_source.models import (
+from homeassistant.components.media_source import (
     BrowseMediaSource,
     MediaSource,
     MediaSourceItem,