Remove legacy requests.set_socket

Adafruit_IO_Power_Relay/code.py

@@ -7,9 +7,10 @@
 import busio
 from digitalio import DigitalInOut
 import neopixel
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 
@@ -101,13 +102,15 @@ def on_relay_msg(client, topic, value):
 wifi.connect()
 print("Connected!")
 
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Set up a MiniMQTT Client
 client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 # Setup the callback methods above

Adafruit_IO_Power_Relay/code_light_sensor/code.py

@@ -8,9 +8,10 @@
 from digitalio import DigitalInOut
 import neopixel
 import adafruit_bh1750
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 
@@ -116,13 +117,15 @@ def on_relay_msg(client, topic, value):
 wifi.connect()
 print("Connected!")
 
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Set up a MiniMQTT Client
 client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 # Setup the callback methods above

Adafruit_IO_Schedule_Trigger/code.py

@@ -6,9 +6,10 @@
 import board
 import busio
 from digitalio import DigitalInOut
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import neopixel
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_io.adafruit_io import IO_MQTT
@@ -104,14 +105,15 @@ def on_relay_msg(client, topic, message):
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Initialize a new MQTT Client object
 mqtt_client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 # Initialize an Adafruit IO MQTT Client

Arduino_Nano_RP2040_Connect/arduino_nano_rp2040_connect_wifi/code.py

@@ -10,8 +10,9 @@
 import board
 import busio
 from digitalio import DigitalInOut
-import adafruit_requests as requests
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_connection_manager
+import adafruit_requests
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 from adafruit_esp32spi import adafruit_esp32spi
 
 # Get wifi details and more from a secrets.py file
@@ -35,7 +36,9 @@
 
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 
-requests.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
+
+requests = adafruit_requests.Session(pool, ssl_context)
 
 if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
     print("ESP32 found and in idle mode")

CircuitPython_Zorque_Text_Game_openai/code.py

@@ -3,8 +3,9 @@
 import os
 import traceback
 
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-import adafruit_requests as requests
+import adafruit_connection_manager
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
+import adafruit_requests
 import adafruit_touchscreen
 from adafruit_ticks import ticks_ms, ticks_add, ticks_less
 from adafruit_bitmap_font.bitmap_font import load_font
@@ -59,7 +60,13 @@
 
 clear='\033[2J'
 
+# variable for setup requests.Session
+requests = None
+
+# pylint: disable=global-statement
 def set_up_wifi():
+    global requests
+
     print(end=clear)
     if openai_api_key is None:
         print(
@@ -81,7 +88,8 @@ def set_up_wifi():
 
     spi = board.SPI()
     esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp_cs, esp_ready, esp_reset)
-    requests.set_socket(socket, esp)
+    ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
+    requests = adafruit_requests.Session(pool, ssl_context)
 
     while not esp.is_connected:
         print("Connecting to AP...")

FunHouse_IOT_Hub/battery_peripheral/code.py

@@ -17,9 +17,10 @@
 from adafruit_lc709203f import LC709203F
 import busio
 from digitalio import DigitalInOut
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import neopixel
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_io.adafruit_io import IO_MQTT
@@ -74,14 +75,15 @@ def message(client, feed_id, payload):
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Initialize a new MQTT Client object
 mqtt_client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 

FunHouse_IOT_Hub/door_peripheral/code.py

@@ -16,9 +16,10 @@
 
 import board
 import busio
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import neopixel
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_io.adafruit_io import IO_MQTT
@@ -57,14 +58,15 @@
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Initialize a new MQTT Client object
 mqtt_client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 

FunHouse_IOT_Hub/neopixel_remote/feather_code/code.py

@@ -17,9 +17,10 @@
 
 import board
 import busio
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import neopixel
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_io.adafruit_io import IO_MQTT
@@ -76,14 +77,15 @@ def on_neopixel(client, topic, message):
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Initialize a new MQTT Client object
 mqtt_client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 

FunHouse_IOT_Hub/relay_heatindex_peripheral/code.py

@@ -19,9 +19,10 @@
 
 import board
 import busio
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import neopixel
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_io.adafruit_io import IO_MQTT
@@ -75,14 +76,15 @@ def on_hi(client, topic, message):
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Initialize a new MQTT Client object
 mqtt_client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 

FunHouse_IOT_Hub/relay_peripheral/code.py

@@ -14,9 +14,10 @@
 """
 import board
 import busio
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import neopixel
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_io.adafruit_io import IO_MQTT
@@ -69,14 +70,15 @@ def on_lamp(client, topic, message):
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Initialize a new MQTT Client object
 mqtt_client = MQTT.MQTT(
     broker="io.adafruit.com",
     username=secrets["aio_username"],
     password=secrets["aio_key"],
+    socket_pool=pool,
+    ssl_context=ssl_context,
 )
 
 

MagTag/MagTag_Webb_Telescope_Status/code.py

@@ -16,7 +16,7 @@
 import wifi
 import socketpool
 import alarm
-import adafruit_requests as requests
+import adafruit_requests
 
 try:
     from secrets import secrets
@@ -70,7 +70,7 @@ def try_refresh():
 
         # Create Socket, initialize requests
         socket = socketpool.SocketPool(wifi.radio)
-        requests = requests.Session(socket, ssl.create_default_context())
+        requests = adafruit_requests.Session(socket, ssl.create_default_context())
     except OSError:
         print("Failed to connect to AP. Rebooting in 3 seconds...")
         time.sleep(3)

MagTag/MagTag_Webb_Telescope_Status/deprecated_original_version/code.py

@@ -16,7 +16,7 @@
 import wifi
 import socketpool
 import alarm
-import adafruit_requests as requests
+import adafruit_requests
 
 try:
     from secrets import secrets
@@ -68,7 +68,7 @@ def try_refresh():
 
         # Create Socket, initialize requests
         socket = socketpool.SocketPool(wifi.radio)
-        requests = requests.Session(socket, ssl.create_default_context())
+        requests = adafruit_requests.Session(socket, ssl.create_default_context())
     except OSError:
         print("Failed to connect to AP. Rebooting in 3 seconds...")
         time.sleep(3)

Metro_M7_Examples/WiFi/code.py

@@ -5,8 +5,9 @@
 import board
 import busio
 from digitalio import DigitalInOut
-import adafruit_requests as requests
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_connection_manager
+import adafruit_requests
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 from adafruit_esp32spi import adafruit_esp32spi
 
 print("ESP32 SPI webclient test")
@@ -22,7 +23,9 @@
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 
-requests.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
+
+requests = adafruit_requests.Session(pool, ssl_context)
 
 if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
     print("ESP32 found and in idle mode")

PyPortal/PyPortal_AWS_IOT_Planter/code.py

@@ -16,9 +16,10 @@
 import busio
 from digitalio import DigitalInOut
 import neopixel
+import adafruit_connection_manager
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 from adafruit_aws_iot import MQTT_CLIENT
 from adafruit_seesaw.seesaw import Seesaw
@@ -86,8 +87,7 @@
 wifi.connect()
 print("Connected!")
 
-# Initialize MQTT interface with the esp interface
-MQTT.set_socket(socket, esp)
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
 
 # Soil Sensor Setup
 i2c_bus = busio.I2C(board.SCL, board.SDA)
@@ -128,7 +128,9 @@ def message(client, topic, msg):
 
 # Set up a new MiniMQTT Client
 client =  MQTT.MQTT(broker = secrets['broker'],
-                    client_id = secrets['client_id'])
+                    client_id = secrets['client_id'],
+                    socket_pool=pool,
+                    ssl_context=ssl_context)
 
 # Initialize AWS IoT MQTT API Client
 aws_iot = MQTT_CLIENT(client)