From 62a5854e40cb554fecb1eec897d7bcb4c94628fe Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Thu, 2 Jun 2022 13:58:04 +0200 Subject: [PATCH] Fix bare except (#72906) --- homeassistant/components/feedreader/__init__.py | 4 ++-- homeassistant/components/qnap/sensor.py | 2 +- tests/components/emulated_hue/test_upnp.py | 2 +- tests/components/system_log/test_init.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/feedreader/__init__.py b/homeassistant/components/feedreader/__init__.py index a4cd546aa16..11a3d4b0498 100644 --- a/homeassistant/components/feedreader/__init__.py +++ b/homeassistant/components/feedreader/__init__.py @@ -199,7 +199,7 @@ class StoredData: with self._lock, open(self._data_file, "rb") as myfile: self._data = pickle.load(myfile) or {} self._cache_outdated = False - except: # noqa: E722 pylint: disable=bare-except + except Exception: # pylint: disable=broad-except _LOGGER.error( "Error loading data from pickled file %s", self._data_file ) @@ -221,6 +221,6 @@ class StoredData: ) try: pickle.dump(self._data, myfile) - except: # noqa: E722 pylint: disable=bare-except + except Exception: # pylint: disable=broad-except _LOGGER.error("Error saving pickled data to %s", self._data_file) self._cache_outdated = True diff --git a/homeassistant/components/qnap/sensor.py b/homeassistant/components/qnap/sensor.py index 1e2bf5b6892..7366dc5dc41 100644 --- a/homeassistant/components/qnap/sensor.py +++ b/homeassistant/components/qnap/sensor.py @@ -306,7 +306,7 @@ class QNAPStatsAPI: self.data["smart_drive_health"] = self._api.get_smart_disk_health() self.data["volumes"] = self._api.get_volumes() self.data["bandwidth"] = self._api.get_bandwidth() - except: # noqa: E722 pylint: disable=bare-except + except Exception: # pylint: disable=broad-except _LOGGER.exception("Failed to fetch QNAP stats from the NAS") diff --git a/tests/components/emulated_hue/test_upnp.py b/tests/components/emulated_hue/test_upnp.py index f392cfaf90d..ce7f013963c 100644 --- a/tests/components/emulated_hue/test_upnp.py +++ b/tests/components/emulated_hue/test_upnp.py @@ -162,7 +162,7 @@ async def test_description_xml(hass, hue_client): root = ET.fromstring(await result.text()) ns = {"s": "urn:schemas-upnp-org:device-1-0"} assert root.find("./s:device/s:serialNumber", ns).text == "001788FFFE23BFC2" - except: # noqa: E722 pylint: disable=bare-except + except Exception: # pylint: disable=broad-except pytest.fail("description.xml is not valid XML!") diff --git a/tests/components/system_log/test_init.py b/tests/components/system_log/test_init.py index 8b9284a4b32..121c29d2eed 100644 --- a/tests/components/system_log/test_init.py +++ b/tests/components/system_log/test_init.py @@ -53,7 +53,7 @@ async def get_error_log(hass_ws_client): def _generate_and_log_exception(exception, log): try: raise Exception(exception) - except: # noqa: E722 pylint: disable=bare-except + except Exception: # pylint: disable=broad-except _LOGGER.exception(log)