From 6762cc783fd9cd5c5f1a674d36da2f3d67448c0a Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 23 Aug 2019 18:28:51 -0400 Subject: [PATCH 1/2] add tested code to reflect minimqtt commit 35ba546 --- adafruit_io/adafruit_io.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index ca9dd5a..9f03847 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -69,7 +69,7 @@ def __init__(self, mqtt_client): ) # MiniMQTT's username kwarg is optional, IO requires a username try: - self._user = self._client._user + self._user = self._client.user except: raise TypeError( "Adafruit IO requires a username, please set one in MiniMQTT" @@ -86,7 +86,7 @@ def __init__(self, mqtt_client): self._client.on_message = self._on_message_mqtt self._logger = False # Write to the MiniMQTT logger, if avaliable. - if self._client._logger is not None: + if self._client.logger is not None: self._logger = True self._client.set_logger_level("DEBUG") self._connected = False @@ -427,7 +427,7 @@ class IO_HTTP: """ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): - self.username = adafruit_io_username + self._username = adafruit_io_username self.key = adafruit_io_key wifi_type = str(type(wifi_manager)) if "ESPSPI_WiFiManager" in wifi_type or "ESPAT_WiFiManager" in wifi_type: @@ -477,7 +477,7 @@ def _compose_path(self, path): """Composes a valid API request path. :param str path: Adafruit IO API URL path. """ - return "https://io.adafruit.com/api/v2/{0}/{1}".format(self.username, path) + return "https://io.adafruit.com/api/v2/{0}/{1}".format(self._username, path) # HTTP Requests def _post(self, path, payload): From 5ac8da2443b2b849648bcf064b4a2e43e0571896 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 23 Aug 2019 18:30:26 -0400 Subject: [PATCH 2/2] remove IO HTTP class changes --- adafruit_io/adafruit_io.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index 9f03847..92f7db9 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -427,7 +427,7 @@ class IO_HTTP: """ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): - self._username = adafruit_io_username + self.username = adafruit_io_username self.key = adafruit_io_key wifi_type = str(type(wifi_manager)) if "ESPSPI_WiFiManager" in wifi_type or "ESPAT_WiFiManager" in wifi_type: @@ -477,7 +477,7 @@ def _compose_path(self, path): """Composes a valid API request path. :param str path: Adafruit IO API URL path. """ - return "https://io.adafruit.com/api/v2/{0}/{1}".format(self._username, path) + return "https://io.adafruit.com/api/v2/{0}/{1}".format(self.username, path) # HTTP Requests def _post(self, path, payload):