Merge pull request #12 from justmobilize/fix-invalid-secret-lookup

Fix invalid secret lookup

Author: dhalbert

adafruit_esp32s2tft/__init__.py

@@ -64,7 +64,7 @@ class ESP32S2TFT(PortalBase):
     :param scale: Default scale is 1, but can be an integer of 1 or greater
     :param debug: Turn on debug print outs. Defaults to False.
     :param use_network: Enable network initialization. Defaults to True.
-                        Setting to False will allow you to use the library without a secrets.py
+                        Setting to False will allow you to use the library without a settings.toml
                         file with wifi configuration in it.
 
     """

adafruit_esp32s2tft/network.py

@@ -73,13 +73,12 @@ def __init__(
 
     def init_io_mqtt(self) -> IO_MQTT:
         """Initialize MQTT for Adafruit IO"""
-        try:
-            aio_username = self._secrets["aio_username"]
-            aio_key = self._secrets["aio_key"]
-        except KeyError:
-            raise KeyError(
-                "Adafruit IO secrets are kept in secrets.py, please add them there!\n\n"
-            ) from KeyError
+        aio_username = self._get_setting["ADAFRUIT_AIO_USERNAME"]
+        aio_key = self._get_setting["ADAFRUIT_AIO_KEY"]
+        if None in [aio_username, aio_key]:
+            raise AttributeError(
+                "Adafruit IO keys are kept in settings.toml, please add them there."
+            )
 
         return self.init_mqtt(IO_MQTT_BROKER, 8883, aio_username, aio_key, True)
 

docs/conf.py

@@ -33,7 +33,6 @@
     "ssl",
     "wifi",
     "socketpool",
-    "secrets",
     "bitmaptools",
 ]