From b7cbb44cfe8138f42a1419b2a564cd3861150d2d Mon Sep 17 00:00:00 2001 From: Jim Bennett Date: Fri, 17 Apr 2020 15:18:34 -0700 Subject: [PATCH 1/2] Using a copy of the borker name when splitting Fix for #26 --- adafruit_minimqtt.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adafruit_minimqtt.py b/adafruit_minimqtt.py index e0f9c3c1..fe49d5d8 100644 --- a/adafruit_minimqtt.py +++ b/adafruit_minimqtt.py @@ -223,11 +223,11 @@ def connect(self, clean_session=True): """ try: - proto, dummy, self.broker, path = self.broker.split("/", 3) + proto, dummy, broker, path = self.broker.split("/", 3) # replace spaces in path path = path.replace(" ", "%20") except ValueError: - proto, dummy, self.broker = self.broker.split("/", 2) + proto, dummy, broker = self.broker.split("/", 2) path = "" if proto == "http:": self.port = MQTT_TCP_PORT @@ -236,11 +236,11 @@ def connect(self, clean_session=True): else: raise ValueError("Unsupported protocol: " + proto) - if ":" in self.broker: - self.broker, port = self.broker.split(":", 1) + if ":" in broker: + broker, port = broker.split(":", 1) port = int(port) - addr = _the_sock.getaddrinfo(self.broker, self.port, 0, _the_sock.SOCK_STREAM)[ + addr = _the_sock.getaddrinfo(broker, self.port, 0, _the_sock.SOCK_STREAM)[ 0 ] self._sock = _the_sock.socket(addr[0], addr[1], addr[2]) @@ -251,7 +251,7 @@ def connect(self, clean_session=True): self.logger.debug( "Attempting to establish secure MQTT connection..." ) - self._sock.connect((self.broker, self.port), _the_interface.TLS_MODE) + self._sock.connect((broker, self.port), _the_interface.TLS_MODE) except RuntimeError as e: raise MMQTTException("Invalid broker address defined.", e) else: From be1ea861170cd6811287448c36ae33d1b91d2e36 Mon Sep 17 00:00:00 2001 From: Jim Bennett Date: Fri, 17 Apr 2020 16:04:30 -0700 Subject: [PATCH 2/2] black formatting --- adafruit_minimqtt.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/adafruit_minimqtt.py b/adafruit_minimqtt.py index fe49d5d8..063a065e 100644 --- a/adafruit_minimqtt.py +++ b/adafruit_minimqtt.py @@ -240,9 +240,7 @@ def connect(self, clean_session=True): broker, port = broker.split(":", 1) port = int(port) - addr = _the_sock.getaddrinfo(broker, self.port, 0, _the_sock.SOCK_STREAM)[ - 0 - ] + addr = _the_sock.getaddrinfo(broker, self.port, 0, _the_sock.SOCK_STREAM)[0] self._sock = _the_sock.socket(addr[0], addr[1], addr[2]) self._sock.settimeout(15) if self.port == 8883: