jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PyLint import issue

Browse Source
This commit is contained in:
Paulus Schoutsen 2015-06-10 23:59:37 -07:00
parent 492ea478e7
commit 0f4de88b92
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/media_player/mpd.py
View File

@ -33,9 +33,9 @@ import logging
import socket import socket
try: try:
from mpd import MPDClient, ConnectionError import mpd
except ImportError: except ImportError:
MPDClient = None mpd = None
from homeassistant.const import ( from homeassistant.const import (
@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
port = config.get('port', 6600) port = config.get('port', 6600)
location = config.get('location', 'MPD') location = config.get('location', 'MPD')
if MPDClient is None: if mpd is None:
_LOGGER.exception( _LOGGER.exception(
"Unable to import mpd2. " "Unable to import mpd2. "
"Did you maybe not install the 'python-mpd2' package?") "Did you maybe not install the 'python-mpd2' package?")
@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
# pylint: disable=no-member # pylint: disable=no-member
try: try:
mpd_client = MPDClient() mpd_client = mpd.MPDClient()
mpd_client.connect(daemon, port) mpd_client.connect(daemon, port)
mpd_client.close() mpd_client.close()
mpd_client.disconnect() mpd_client.disconnect()
@ -82,9 +82,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
return False return False
mpd = [] add_devices([MpdDevice(daemon, port, location)])
mpd.append(MpdDevice(daemon, port, location))
add_devices(mpd)
class MpdDevice(MediaPlayerDevice): class MpdDevice(MediaPlayerDevice):
@ -100,7 +98,7 @@ class MpdDevice(MediaPlayerDevice):
self.status = None self.status = None
self.currentsong = None self.currentsong = None
self.client = MPDClient() self.client = mpd.MPDClient()
self.client.timeout = 10 self.client.timeout = 10
self.client.idletimeout = None self.client.idletimeout = None
self.update() self.update()
@ -109,7 +107,7 @@ class MpdDevice(MediaPlayerDevice):
try: try:
self.status = self.client.status() self.status = self.client.status()
self.currentsong = self.client.currentsong() self.currentsong = self.client.currentsong()
except ConnectionError: except mpd.ConnectionError:
self.client.connect(self.server, self.port) self.client.connect(self.server, self.port)
self.status = self.client.status() self.status = self.client.status()
self.currentsong = self.client.currentsong() self.currentsong = self.client.currentsong()