diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py index 9989e07c49b..d6f14828050 100644 --- a/homeassistant/components/mqtt/__init__.py +++ b/homeassistant/components/mqtt/__init__.py @@ -560,7 +560,7 @@ async def websocket_subscribe( payload = cast(bytes, mqttmsg.payload).decode( DEFAULT_ENCODING ) # not str because encoding is set to None - except (AttributeError, UnicodeDecodeError): + except AttributeError, UnicodeDecodeError: # Convert non UTF-8 payload to a string presentation payload = str(mqttmsg.payload) diff --git a/homeassistant/components/mqtt/client.py b/homeassistant/components/mqtt/client.py index ccd287f184d..cbfaca71acf 100644 --- a/homeassistant/components/mqtt/client.py +++ b/homeassistant/components/mqtt/client.py @@ -175,7 +175,7 @@ async def async_publish( # requires bytes as payload try: outgoing_payload = outgoing_payload.encode(encoding) - except (AttributeError, LookupError, UnicodeEncodeError): + except AttributeError, LookupError, UnicodeEncodeError: _LOGGER.error( "Can't encode payload for publishing %s on %s with encoding %s", payload, @@ -1179,7 +1179,7 @@ class MQTT: if subscription.encoding is not None: try: payload = msg.payload.decode(subscription.encoding) - except (AttributeError, UnicodeDecodeError): + except AttributeError, UnicodeDecodeError: _LOGGER.warning( "Can't decode payload %s on %s with encoding %s (for %s)", msg.payload[0:8192], diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py index 230fae72bd4..8365d86f053 100644 --- a/homeassistant/components/mqtt/config_flow.py +++ b/homeassistant/components/mqtt/config_flow.py @@ -1022,7 +1022,7 @@ def validate_field( return try: user_input[field] = validator(user_input[field]) - except (ValueError, vol.Error, vol.Invalid): + except ValueError, vol.Error, vol.Invalid: errors[field] = error @@ -3882,7 +3882,7 @@ def validate_user_input( merged_user_input[field] = ( validator(value) if validator is not None else value ) - except (ValueError, vol.Error, vol.Invalid): + except ValueError, vol.Error, vol.Invalid: data_schema_field = data_schema_fields[field] errors[data_schema_field.section or field] = ( data_schema_field.error or "invalid_input" @@ -5107,7 +5107,7 @@ def async_convert_to_pem( encryption_algorithm=NoEncryption(), ) return pem_key_data.decode("utf-8") - except (TypeError, ValueError, SSLError): + except TypeError, ValueError, SSLError: _LOGGER.exception("Error converting %s file data to PEM format", pem_type.name) return None @@ -5507,7 +5507,7 @@ def check_certicate_chain() -> str | None: try: with open(private_key, "rb") as client_key_file: load_pem_private_key(client_key_file.read(), password=None) - except (TypeError, ValueError): + except TypeError, ValueError: return "client_key_error" # Check the certificate chain context = SSLContext(PROTOCOL_TLS_CLIENT) diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py index eab5557e06f..ed93701feca 100644 --- a/homeassistant/components/mqtt/light/schema_json.py +++ b/homeassistant/components/mqtt/light/schema_json.py @@ -278,7 +278,7 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity): y = float(values["color"]["y"]) self._attr_color_mode = ColorMode.XY self._attr_xy_color = (x, y) - except (KeyError, TypeError, ValueError): + except KeyError, TypeError, ValueError: _LOGGER.warning( "Invalid or incomplete color value '%s' received for entity %s", values, @@ -316,7 +316,7 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity): except KeyError: pass - except (TypeError, ValueError): + except TypeError, ValueError: _LOGGER.warning( "Invalid brightness value '%s' received for entity %s", values["brightness"], diff --git a/homeassistant/components/mqtt/models.py b/homeassistant/components/mqtt/models.py index 4cc0424195a..52ad9f5f080 100644 --- a/homeassistant/components/mqtt/models.py +++ b/homeassistant/components/mqtt/models.py @@ -58,7 +58,7 @@ def convert_outgoing_mqtt_payload( if isinstance(payload, str) and payload.startswith(("b'", 'b"')): try: native_object = literal_eval(payload) - except (ValueError, TypeError, SyntaxError, MemoryError): + except ValueError, TypeError, SyntaxError, MemoryError: pass else: if isinstance(native_object, bytes):