OSError is alias for IOException and base class for many other exceptions - no need to catch redundant exceptions if OSError already present in except-clause (#4111)

This commit is contained in:
Erik Eriksson 2016-10-30 00:33:56 +02:00 committed by Paulus Schoutsen
parent 9c0455e3dc
commit 3317b4916b
6 changed files with 13 additions and 17 deletions

View File

@ -6,7 +6,6 @@ https://home-assistant.io/components/climate.radiotherm/
""" """
import datetime import datetime
import logging import logging
from urllib.error import URLError
import voluptuous as vol import voluptuous as vol
@ -52,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
try: try:
tstat = radiotherm.get_thermostat(host) tstat = radiotherm.get_thermostat(host)
tstats.append(RadioThermostat(tstat, hold_temp)) tstats.append(RadioThermostat(tstat, hold_temp))
except (URLError, OSError): except OSError:
_LOGGER.exception("Unable to connect to Radio Thermostat: %s", _LOGGER.exception("Unable to connect to Radio Thermostat: %s",
host) host)

View File

@ -5,7 +5,6 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/media_player.panasonic_viera/ https://home-assistant.io/components/media_player.panasonic_viera/
""" """
import logging import logging
import socket
import voluptuous as vol import voluptuous as vol
@ -60,9 +59,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
try: try:
remote.get_mute() remote.get_mute()
except (socket.timeout, TimeoutError, OSError): except OSError as error:
_LOGGER.error('Panasonic Viera TV is not available at %s:%d', _LOGGER.error('Panasonic Viera TV is not available at %s:%d: %s',
host, port) host, port, error)
return False return False
add_devices([PanasonicVieraTVDevice(name, remote)]) add_devices([PanasonicVieraTVDevice(name, remote)])
@ -88,7 +87,7 @@ class PanasonicVieraTVDevice(MediaPlayerDevice):
try: try:
self._muted = self._remote.get_mute() self._muted = self._remote.get_mute()
self._state = STATE_ON self._state = STATE_ON
except (socket.timeout, TimeoutError, OSError): except OSError:
self._state = STATE_OFF self._state = STATE_OFF
return False return False
return True return True
@ -98,7 +97,7 @@ class PanasonicVieraTVDevice(MediaPlayerDevice):
try: try:
self._remote.send_key(key) self._remote.send_key(key)
self._state = STATE_ON self._state = STATE_ON
except (socket.timeout, TimeoutError, OSError): except OSError:
self._state = STATE_OFF self._state = STATE_OFF
return False return False
return True return True
@ -120,7 +119,7 @@ class PanasonicVieraTVDevice(MediaPlayerDevice):
try: try:
volume = self._remote.get_volume() / 100 volume = self._remote.get_volume() / 100
self._state = STATE_ON self._state = STATE_ON
except (socket.timeout, TimeoutError, OSError): except OSError:
self._state = STATE_OFF self._state = STATE_OFF
return volume return volume
@ -156,7 +155,7 @@ class PanasonicVieraTVDevice(MediaPlayerDevice):
try: try:
self._remote.set_volume(volume) self._remote.set_volume(volume)
self._state = STATE_ON self._state = STATE_ON
except (socket.timeout, TimeoutError, OSError): except OSError:
self._state = STATE_OFF self._state = STATE_OFF
def media_play_pause(self): def media_play_pause(self):

View File

@ -5,7 +5,6 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/media_player.samsungtv/ https://home-assistant.io/components/media_player.samsungtv/
""" """
import logging import logging
import socket
import voluptuous as vol import voluptuous as vol
@ -101,8 +100,7 @@ class SamsungTVDevice(MediaPlayerDevice):
self._state = STATE_ON self._state = STATE_ON
self._remote = None self._remote = None
return False return False
except (self._remote_class.ConnectionClosed, socket.timeout, except (self._remote_class.ConnectionClosed, OSError):
TimeoutError, OSError):
self._state = STATE_OFF self._state = STATE_OFF
self._remote = None self._remote = None
return False return False

View File

@ -163,7 +163,7 @@ class LogitechMediaServer(object):
return response return response
except (OSError, ConnectionError, EOFError) as error: except (OSError, EOFError) as error:
_LOGGER.error("Could not communicate with %s:%d: %s", _LOGGER.error("Could not communicate with %s:%d: %s",
self.host, self.host,
self.port, self.port,

View File

@ -71,8 +71,8 @@ def load_data(url=None, file=None, username=None, password=None):
else: else:
_LOGGER.warning("Can't load photo no photo found in params!") _LOGGER.warning("Can't load photo no photo found in params!")
except (OSError, IOError, requests.exceptions.RequestException): except OSError as error:
_LOGGER.error("Can't load photo into ByteIO") _LOGGER.error("Can't load photo into ByteIO: %s", error)
return None return None

View File

@ -157,7 +157,7 @@ class TelldusLiveData(object):
response = self._client.request(what, params) response = self._client.request(what, params)
_LOGGER.debug("got response %s", response) _LOGGER.debug("got response %s", response)
return response return response
except (ConnectionError, TimeoutError, OSError) as error: except OSError as error:
_LOGGER.error("failed to make request to Tellduslive servers: %s", _LOGGER.error("failed to make request to Tellduslive servers: %s",
error) error)
return None return None