diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py index 56b9e88e27e..efa2ee3a48a 100644 --- a/homeassistant/components/alexa/capabilities.py +++ b/homeassistant/components/alexa/capabilities.py @@ -169,60 +169,47 @@ class AlexaCapability: def serialize_discovery(self): """Serialize according to the Discovery API.""" - # pylint: disable=assignment-from-none - # Methods may be overridden and return a value. result = {"type": "AlexaInterface", "interface": self.name(), "version": "3"} if (instance := self.instance) is not None: result["instance"] = instance - properties_supported = self.properties_supported() - if properties_supported: + if properties_supported := self.properties_supported(): result["properties"] = { - "supported": self.properties_supported(), + "supported": properties_supported, "proactivelyReported": self.properties_proactively_reported(), "retrievable": self.properties_retrievable(), } - proactively_reported = self.capability_proactively_reported() - if proactively_reported is not None: + if (proactively_reported := self.capability_proactively_reported()) is not None: result["proactivelyReported"] = proactively_reported - non_controllable = self.properties_non_controllable() - if non_controllable is not None: + if (non_controllable := self.properties_non_controllable()) is not None: result["properties"]["nonControllable"] = non_controllable - supports_deactivation = self.supports_deactivation() - if supports_deactivation is not None: + if (supports_deactivation := self.supports_deactivation()) is not None: result["supportsDeactivation"] = supports_deactivation - capability_resources = self.capability_resources() - if capability_resources: + if capability_resources := self.capability_resources(): result["capabilityResources"] = capability_resources - configuration = self.configuration() - if configuration: + if configuration := self.configuration(): result["configuration"] = configuration # The plural configurations object is different than the singular configuration object above. - configurations = self.configurations() - if configurations: + if configurations := self.configurations(): result["configurations"] = configurations - semantics = self.semantics() - if semantics: + if semantics := self.semantics(): result["semantics"] = semantics - supported_operations = self.supported_operations() - if supported_operations: + if supported_operations := self.supported_operations(): result["supportedOperations"] = supported_operations - inputs = self.inputs() - if inputs: + if inputs := self.inputs(): result["inputs"] = inputs - camera_stream_configurations = self.camera_stream_configurations() - if camera_stream_configurations: + if camera_stream_configurations := self.camera_stream_configurations(): result["cameraStreamConfigurations"] = camera_stream_configurations return result