From d638130a23f4b6b5d61943ee543a7020502e121a Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Feb 2019 11:05:45 -0500 Subject: [PATCH 1/5] remove isinstance in favor of type --- 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 a7606ab..7201b82 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -38,7 +38,6 @@ * Adafruit's ESP32SPI library: https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI """ -from adafruit_esp32spi import adafruit_esp32spi_wifimanager from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError __version__ = "0.0.0-auto.0" @@ -57,7 +56,8 @@ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): """ self.username = adafruit_io_username self.key = adafruit_io_key - if isinstance(wifi_manager, adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager): + wifi_type = str(type(wifi_manager)) + if ('ESPSPI_WiFiManager' in wifi_type): self.wifi = wifi_manager else: raise TypeError("This library requires a WiFiManager object.") From 1f9ae49dfc9a9b165717daf0912a6bbaf9923152 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Feb 2019 11:06:57 -0500 Subject: [PATCH 2/5] add in ESPAT_Wifimanager check --- 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 7201b82..40e22b4 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -52,12 +52,12 @@ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): Creates an instance of the Adafruit IO REST Client. :param str adafruit_io_username: Adafruit IO Username :param str adafruit_io_key: Adafruit IO Key - :param wifi_manager: WiFiManager object from adafruit_esp32spi_wifimanager + :param wifi_manager: WiFiManager object from ESPSPI_WiFiManager or ESPAT_WifiManager """ self.username = adafruit_io_username self.key = adafruit_io_key wifi_type = str(type(wifi_manager)) - if ('ESPSPI_WiFiManager' in wifi_type): + if ('ESPSPI_WiFiManager' in wifi_type or 'ESPAT_WifiManager' in wifi_type): self.wifi = wifi_manager else: raise TypeError("This library requires a WiFiManager object.") From 60ca5474542967e7983713db818631e25cbfc9a6 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Feb 2019 11:08:08 -0500 Subject: [PATCH 3/5] reflect correct naming scheme --- 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 40e22b4..24d8974 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -52,12 +52,12 @@ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): Creates an instance of the Adafruit IO REST Client. :param str adafruit_io_username: Adafruit IO Username :param str adafruit_io_key: Adafruit IO Key - :param wifi_manager: WiFiManager object from ESPSPI_WiFiManager or ESPAT_WifiManager + :param wifi_manager: WiFiManager object from ESPSPI_WiFiManager or ESPAT_WiFiManager """ 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): + if ('ESPSPI_WiFiManager' in wifi_type or 'ESPAT_WiFiManager' in wifi_type): self.wifi = wifi_manager else: raise TypeError("This library requires a WiFiManager object.") From 493355ae87b8ebe6b817d9070e04932d2019464e Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Feb 2019 11:09:54 -0500 Subject: [PATCH 4/5] remove automock import from config, we dont need it anymore since were not importing --- adafruit_io/adafruit_io.py | 2 +- docs/conf.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index 24d8974..d05fa6f 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -35,7 +35,7 @@ * Adafruit CircuitPython firmware for the supported boards: https://github.com/adafruit/circuitpython/releases -* Adafruit's ESP32SPI library: +* Adafruits ESP32SPI library: https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI """ from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError diff --git a/docs/conf.py b/docs/conf.py index b875a8a..e3d0d23 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,8 +16,6 @@ 'sphinx.ext.todo', ] -autodoc_mock_imports = ["digitalio", "busdevice", "neopixel", "adafruit_esp32spi"] - intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} # Add any paths that contain templates here, relative to this directory. From eadb500cbfa2e30fbb741587275c324f234be358 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Feb 2019 11:16:06 -0500 Subject: [PATCH 5/5] added espcontrol link --- adafruit_io/adafruit_io.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index d05fa6f..ef7c97a 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -35,8 +35,9 @@ * Adafruit CircuitPython firmware for the supported boards: https://github.com/adafruit/circuitpython/releases -* Adafruits ESP32SPI library: +* Adafruit ESP32SPI or ESP_ATcontrol library: https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI + https://github.com/adafruit/Adafruit_CircuitPython_ESP_ATcontrol """ from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError