diff --git a/homeassistant/components/blackbird/media_player.py b/homeassistant/components/blackbird/media_player.py index eca7fa84f50..e1aa7200c07 100644 --- a/homeassistant/components/blackbird/media_player.py +++ b/homeassistant/components/blackbird/media_player.py @@ -2,9 +2,11 @@ import logging import socket +from pyblackbird import get_blackbird +from serial import SerialException import voluptuous as vol -from homeassistant.components.media_player import MediaPlayerDevice, PLATFORM_SCHEMA +from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerDevice from homeassistant.components.media_player.const import ( DOMAIN, SUPPORT_SELECT_SOURCE, @@ -72,9 +74,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None): port = config.get(CONF_PORT) host = config.get(CONF_HOST) - from pyblackbird import get_blackbird - from serial import SerialException - connection = None if port is not None: try: diff --git a/tests/components/blackbird/test_media_player.py b/tests/components/blackbird/test_media_player.py index c41d5dcef41..34309fdbcf3 100644 --- a/tests/components/blackbird/test_media_player.py +++ b/tests/components/blackbird/test_media_player.py @@ -180,7 +180,10 @@ class TestBlackbirdMediaPlayer(unittest.TestCase): self.hass = tests.common.get_test_home_assistant() self.hass.start() # Note, source dictionary is unsorted! - with mock.patch("pyblackbird.get_blackbird", new=lambda *a: self.blackbird): + with mock.patch( + "homeassistant.components.blackbird.media_player.get_blackbird", + new=lambda *a: self.blackbird, + ): setup_platform( self.hass, {