From 803452a1acd2a567ae1c2063e82b7128b5a702b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20D=C3=B6rre?= Date: Thu, 1 Feb 2024 12:36:19 +0000 Subject: [PATCH] umqtt.simple: Simplify check for user being unused. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There don't seem to be any MQTT implementations that expect an empty username (instead of the field missing), so the check for unused `user` can be simplified. Signed-off-by: Felix Dörre --- micropython/umqtt.simple/umqtt/simple.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py index 2b26947..c59c6d9 100644 --- a/micropython/umqtt.simple/umqtt/simple.py +++ b/micropython/umqtt.simple/umqtt/simple.py @@ -75,7 +75,7 @@ class MQTTClient: sz = 10 + 2 + len(self.client_id) msg[6] = clean_session << 1 - if self.user is not None: + if self.user: sz += 2 + len(self.user) + 2 + len(self.pswd) msg[6] |= 0xC0 if self.keepalive: @@ -101,7 +101,7 @@ class MQTTClient: if self.lw_topic: self._send_str(self.lw_topic) self._send_str(self.lw_msg) - if self.user is not None: + if self.user: self._send_str(self.user) self._send_str(self.pswd) resp = self.sock.read(4)