Merge pull request #61 from brentru/switch-requests

Remove ESP32SPI_Requests, switch to CircuitPython_Requests

Author: brentru

adafruit_esp32spi/adafruit_esp32spi_requests.py

@@ -34,7 +34,8 @@
 from time import sleep
 from micropython import const
 from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_esp32spi.adafruit_esp32spi_requests as requests
+import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_requests as requests
 
 class ESPSPI_WiFiManager:
     """
@@ -61,7 +62,7 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2, connection_type=
         self.password = secrets['password']
         self.attempts = attempts
         self._connection_type = connection_type
-        requests.set_interface(self.esp)
+        requests.set_socket(socket, esp)
         self.statuspix = status_pixel
         self.pixel_status(0)
 

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -50,7 +50,7 @@
 import gc
 from micropython import const
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_esp32spi.adafruit_esp32spi_requests import parse_headers
+from adafruit_requests import parse_headers
 
 _the_interface = None   # pylint: disable=invalid-name
 def set_interface(iface):

adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py

@@ -7,8 +7,5 @@
 .. automodule:: adafruit_esp32spi.adafruit_esp32spi
    :members:
 
-.. automodule:: adafruit_esp32spi.adafruit_esp32spi_requests
-   :members:
-
 .. automodule:: adafruit_esp32spi.adafruit_esp32spi_socket
    :members:

docs/api.rst

@@ -1,9 +1,9 @@
 import board
 import busio
 from digitalio import DigitalInOut
-
+import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_esp32spi.adafruit_esp32spi_requests as requests
+import adafruit_requests as requests
 
 print("ESP32 SPI webclient test")
 
@@ -24,7 +24,7 @@
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 
-requests.set_interface(esp)
+requests.set_socket(socket, esp)
 
 if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
     print("ESP32 found and in idle mode")

examples/esp32spi_simpletest.py

@@ -12,8 +12,9 @@
 import busio
 from digitalio import DigitalInOut
 
+import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_esp32spi.adafruit_esp32spi_requests as requests
+import adafruit_requests as requests
 
 # Version number comparison code. Credit to gnud on stackoverflow
 # (https://stackoverflow.com/a/1714190), swapping out cmp() to
@@ -40,7 +41,7 @@ def normalize(v):
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 
-requests.set_interface(esp)
+requests.set_socket(socket, esp)
 
 if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
     print("ESP32 found and in idle mode")