From 105461edb52f19b9e38508993d3ba5216a7c61b6 Mon Sep 17 00:00:00 2001 From: ThaStealth Date: Tue, 3 Sep 2019 17:05:23 +0200 Subject: [PATCH] Remove solaredge_local duplicate code (#25941) * Removed duplicate code * Update sensor.py Splitted exceptions into two seperate ones * Update sensor.py * Update sensor.py * Update sensor.py Fixed linting errors * Update sensor.py --- .../components/solaredge_local/sensor.py | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/homeassistant/components/solaredge_local/sensor.py b/homeassistant/components/solaredge_local/sensor.py index 4bf015a7489..80bd8e1f61e 100644 --- a/homeassistant/components/solaredge_local/sensor.py +++ b/homeassistant/components/solaredge_local/sensor.py @@ -149,25 +149,19 @@ class SolarEdgeData: try: response = self.api.get_status() _LOGGER.debug("response from SolarEdge: %s", response) + except (ConnectTimeout): + _LOGGER.error("Connection timeout, skipping update") + return + except (HTTPError): + _LOGGER.error("Could not retrieve data, skipping update") + return + try: self.data["energyTotal"] = response.energy.total self.data["energyThisYear"] = response.energy.thisYear self.data["energyThisMonth"] = response.energy.thisMonth self.data["energyToday"] = response.energy.today self.data["currentPower"] = response.powerWatt - _LOGGER.debug("Updated SolarEdge overview data: %s", self.data) except AttributeError: - _LOGGER.error("Missing details data in solaredge response") - _LOGGER.debug("Response is: %s", response) - return - except (ConnectTimeout, HTTPError): - _LOGGER.error("Could not retrieve data, skipping update") - return - - self.data["energyTotal"] = response.energy.total - self.data["energyThisYear"] = response.energy.thisYear - self.data["energyThisMonth"] = response.energy.thisMonth - self.data["energyToday"] = response.energy.today - self.data["currentPower"] = response.powerWatt - _LOGGER.debug("Updated SolarEdge overview data: %s", self.data) + _LOGGER.error("Missing details data in SolarEdge response")