From cc93dd49286759b040786b80a635d9d359ab9e78 Mon Sep 17 00:00:00 2001 From: Paolo Tuninetto Date: Wed, 16 Oct 2019 12:05:05 +0200 Subject: [PATCH] Move imports in Kodi component (#27728) * Move imports for Kodi component * Removed empty line ad requested by review --- homeassistant/components/kodi/media_player.py | 17 ++++------------- homeassistant/components/kodi/notify.py | 6 ++---- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/homeassistant/components/kodi/media_player.py b/homeassistant/components/kodi/media_player.py index 9f0aab6c00c..9b2ba01e90a 100644 --- a/homeassistant/components/kodi/media_player.py +++ b/homeassistant/components/kodi/media_player.py @@ -7,6 +7,10 @@ import socket import urllib import aiohttp +import jsonrpc_base +import jsonrpc_async +import jsonrpc_websocket + import voluptuous as vol from homeassistant.components.kodi import SERVICE_CALL_METHOD @@ -231,8 +235,6 @@ def cmd(func): @wraps(func) async def wrapper(obj, *args, **kwargs): """Wrap all command methods.""" - import jsonrpc_base - try: await func(obj, *args, **kwargs) except jsonrpc_base.jsonrpc.TransportError as exc: @@ -268,9 +270,6 @@ class KodiDevice(MediaPlayerDevice): unique_id=None, ): """Initialize the Kodi device.""" - import jsonrpc_async - import jsonrpc_websocket - self.hass = hass self._name = name self._unique_id = unique_id @@ -389,8 +388,6 @@ class KodiDevice(MediaPlayerDevice): async def _get_players(self): """Return the active player objects or None.""" - import jsonrpc_base - try: return await self.server.Player.GetActivePlayers() except jsonrpc_base.jsonrpc.TransportError: @@ -420,8 +417,6 @@ class KodiDevice(MediaPlayerDevice): async def async_ws_connect(self): """Connect to Kodi via websocket protocol.""" - import jsonrpc_base - try: ws_loop_future = await self._ws_server.ws_connect() except jsonrpc_base.jsonrpc.TransportError: @@ -801,8 +796,6 @@ class KodiDevice(MediaPlayerDevice): async def async_call_method(self, method, **kwargs): """Run Kodi JSONRPC API method with params.""" - import jsonrpc_base - _LOGGER.debug("Run API method %s, kwargs=%s", method, kwargs) result_ok = False try: @@ -850,8 +843,6 @@ class KodiDevice(MediaPlayerDevice): All the albums of an artist can be added with media_name="ALL" """ - import jsonrpc_base - params = {"playlistid": 0} if media_type == "SONG": if media_id is None: diff --git a/homeassistant/components/kodi/notify.py b/homeassistant/components/kodi/notify.py index 41dfc42b5de..1072cf1b732 100644 --- a/homeassistant/components/kodi/notify.py +++ b/homeassistant/components/kodi/notify.py @@ -2,6 +2,8 @@ import logging import aiohttp +import jsonrpc_async + import voluptuous as vol from homeassistant.const import ( @@ -77,8 +79,6 @@ class KodiNotificationService(BaseNotificationService): def __init__(self, hass, url, auth=None): """Initialize the service.""" - import jsonrpc_async - self._url = url kwargs = {"timeout": DEFAULT_TIMEOUT, "session": async_get_clientsession(hass)} @@ -90,8 +90,6 @@ class KodiNotificationService(BaseNotificationService): async def async_send_message(self, message="", **kwargs): """Send a message to Kodi.""" - import jsonrpc_async - try: data = kwargs.get(ATTR_DATA) or {}