From 584967a35af09c73f7c64cbf61b42d5cb02432ab Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 14 Jun 2023 15:33:05 -1000 Subject: [PATCH] Avoid double call to self.suggested_unit_of_measurement in sensor unit_of_measurement (#94582) --- homeassistant/components/sensor/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/sensor/__init__.py b/homeassistant/components/sensor/__init__.py index f21f57d9d36..c796ad55421 100644 --- a/homeassistant/components/sensor/__init__.py +++ b/homeassistant/components/sensor/__init__.py @@ -443,8 +443,10 @@ class SensorEntity(Entity): return self._sensor_option_unit_of_measurement # Second priority, for non registered entities: unit suggested by integration - if not self.unique_id and self.suggested_unit_of_measurement: - return self.suggested_unit_of_measurement + if not self.unique_id and ( + suggested_unit_of_measurement := self.suggested_unit_of_measurement + ): + return suggested_unit_of_measurement # Third priority: Legacy temperature conversion, which applies # to both registered and non registered entities