Merge pull request #14 from brentru/patch-mmqtt

Remove workaround for MiniMQTT (Issue #25)

Author: brentru

adafruit_azureiot/iot_mqtt.py

@@ -114,12 +114,11 @@ def _gen_sas_token(self) -> str:
         token = "SharedAccessSignature sr={}&sig={}&se={}".format(uri, signature, token_expiry)
         return token
 
-    # Workaround for https://github.com/adafruit/Adafruit_CircuitPython_MiniMQTT/issues/25
-    def _try_create_mqtt_client(self, hostname: str) -> None:
+    def _create_mqtt_client(self) -> None:
         minimqtt.set_socket(self._socket, self._iface)
 
         self._mqtts = MQTT(
-            broker=hostname,
+            broker=self._hostname,
             username=self._username,
             password=self._passwd,
             port=8883,
@@ -142,13 +141,6 @@ def _try_create_mqtt_client(self, hostname: str) -> None:
         self._mqtts.last_will()
         self._mqtts.connect()
 
-    def _create_mqtt_client(self) -> None:
-        try:
-            self._try_create_mqtt_client(self._hostname)
-        except ValueError:
-            # Workaround for https://github.com/adafruit/Adafruit_CircuitPython_MiniMQTT/issues/25
-            self._try_create_mqtt_client("https://" + self._hostname)
-
     # pylint: disable=C0103, W0613
     def _on_connect(self, client, userdata, _, rc) -> None:
         self._logger.info("- iot_mqtt :: _on_connect :: rc = " + str(rc) + ", userdata = " + str(userdata))