Skip to content

Commit 85e851d

Browse files
dhalbertdhalbert
authored
Merge pull request #2743 from justmobilize/remove-set-socket
Remove legacy requests.set_socket
2 parents 2c3ce0c + bca3bab commit 85e851d

File tree

22 files changed

+116
-67
lines changed

22 files changed

+116
-67
lines changed

‎Adafruit_IO_Power_Relay/code.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import busio
88
from digitalio import DigitalInOut
99
import neopixel
10+
import adafruit_connection_manager
1011
from adafruit_esp32spi import adafruit_esp32spi
1112
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
12-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
13+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1314

1415
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1516

@@ -101,13 +102,15 @@ def on_relay_msg(client, topic, value):
101102
wifi.connect()
102103
print("Connected!")
103104

104-
MQTT.set_socket(socket, esp)
105+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
105106

106107
# Set up a MiniMQTT Client
107108
client = MQTT.MQTT(
108109
broker="io.adafruit.com",
109110
username=secrets["aio_username"],
110111
password=secrets["aio_key"],
112+
socket_pool=pool,
113+
ssl_context=ssl_context,
111114
)
112115

113116
# Setup the callback methods above

‎Adafruit_IO_Power_Relay/code_light_sensor/code.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
from digitalio import DigitalInOut
99
import neopixel
1010
import adafruit_bh1750
11+
import adafruit_connection_manager
1112
from adafruit_esp32spi import adafruit_esp32spi
1213
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
13-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
14+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1415

1516
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1617

@@ -116,13 +117,15 @@ def on_relay_msg(client, topic, value):
116117
wifi.connect()
117118
print("Connected!")
118119

119-
MQTT.set_socket(socket, esp)
120+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
120121

121122
# Set up a MiniMQTT Client
122123
client = MQTT.MQTT(
123124
broker="io.adafruit.com",
124125
username=secrets["aio_username"],
125126
password=secrets["aio_key"],
127+
socket_pool=pool,
128+
ssl_context=ssl_context,
126129
)
127130

128131
# Setup the callback methods above

‎Adafruit_IO_Schedule_Trigger/code.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import board
77
import busio
88
from digitalio import DigitalInOut
9+
import adafruit_connection_manager
910
from adafruit_esp32spi import adafruit_esp32spi
1011
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
12+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1213
import neopixel
1314
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1415
from adafruit_io.adafruit_io import IO_MQTT
@@ -104,14 +105,15 @@ def on_relay_msg(client, topic, message):
104105
wifi.connect()
105106
print("Connected!")
106107

107-
# Initialize MQTT interface with the esp interface
108-
MQTT.set_socket(socket, esp)
108+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
109109

110110
# Initialize a new MQTT Client object
111111
mqtt_client = MQTT.MQTT(
112112
broker="io.adafruit.com",
113113
username=secrets["aio_username"],
114114
password=secrets["aio_key"],
115+
socket_pool=pool,
116+
ssl_context=ssl_context,
115117
)
116118

117119
# Initialize an Adafruit IO MQTT Client

‎Arduino_Nano_RP2040_Connect/arduino_nano_rp2040_connect_wifi/code.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
import board
1111
import busio
1212
from digitalio import DigitalInOut
13-
import adafruit_requests as requests
14-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
13+
import adafruit_connection_manager
14+
import adafruit_requests
15+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1516
from adafruit_esp32spi import adafruit_esp32spi
1617

1718
# Get wifi details and more from a secrets.py file
@@ -35,7 +36,9 @@
3536

3637
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
3738

38-
requests.set_socket(socket, esp)
39+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
40+
41+
requests = adafruit_requests.Session(pool, ssl_context)
3942

4043
if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
4144
print("ESP32 found and in idle mode")

‎CircuitPython_Zorque_Text_Game_openai/code.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import os
44
import traceback
55

6-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
7-
import adafruit_requests as requests
6+
import adafruit_connection_manager
7+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
8+
import adafruit_requests
89
import adafruit_touchscreen
910
from adafruit_ticks import ticks_ms, ticks_add, ticks_less
1011
from adafruit_bitmap_font.bitmap_font import load_font
@@ -59,7 +60,13 @@
5960

6061
clear='\033[2J'
6162

63+
# variable for setup requests.Session
64+
requests = None
65+
66+
# pylint: disable=global-statement
6267
def set_up_wifi():
68+
global requests
69+
6370
print(end=clear)
6471
if openai_api_key is None:
6572
print(
@@ -81,7 +88,8 @@ def set_up_wifi():
8188

8289
spi = board.SPI()
8390
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp_cs, esp_ready, esp_reset)
84-
requests.set_socket(socket, esp)
91+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
92+
requests = adafruit_requests.Session(pool, ssl_context)
8593

8694
while not esp.is_connected:
8795
print("Connecting to AP...")

‎FunHouse_IOT_Hub/battery_peripheral/code.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
from adafruit_lc709203f import LC709203F
1818
import busio
1919
from digitalio import DigitalInOut
20+
import adafruit_connection_manager
2021
from adafruit_esp32spi import adafruit_esp32spi
2122
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
22-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
23+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
2324
import neopixel
2425
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2526
from adafruit_io.adafruit_io import IO_MQTT
@@ -74,14 +75,15 @@ def message(client, feed_id, payload):
7475
wifi.connect()
7576
print("Connected!")
7677

77-
# Initialize MQTT interface with the esp interface
78-
MQTT.set_socket(socket, esp)
78+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
7979

8080
# Initialize a new MQTT Client object
8181
mqtt_client = MQTT.MQTT(
8282
broker="io.adafruit.com",
8383
username=secrets["aio_username"],
8484
password=secrets["aio_key"],
85+
socket_pool=pool,
86+
ssl_context=ssl_context,
8587
)
8688

8789

‎FunHouse_IOT_Hub/door_peripheral/code.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616

1717
import board
1818
import busio
19+
import adafruit_connection_manager
1920
from adafruit_esp32spi import adafruit_esp32spi
2021
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
21-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
22+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
2223
import neopixel
2324
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2425
from adafruit_io.adafruit_io import IO_MQTT
@@ -57,14 +58,15 @@
5758
wifi.connect()
5859
print("Connected!")
5960

60-
# Initialize MQTT interface with the esp interface
61-
MQTT.set_socket(socket, esp)
61+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
6262

6363
# Initialize a new MQTT Client object
6464
mqtt_client = MQTT.MQTT(
6565
broker="io.adafruit.com",
6666
username=secrets["aio_username"],
6767
password=secrets["aio_key"],
68+
socket_pool=pool,
69+
ssl_context=ssl_context,
6870
)
6971

7072

‎FunHouse_IOT_Hub/neopixel_remote/feather_code/code.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717

1818
import board
1919
import busio
20+
import adafruit_connection_manager
2021
from adafruit_esp32spi import adafruit_esp32spi
2122
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
22-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
23+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
2324
import neopixel
2425
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2526
from adafruit_io.adafruit_io import IO_MQTT
@@ -76,14 +77,15 @@ def on_neopixel(client, topic, message):
7677
wifi.connect()
7778
print("Connected!")
7879

79-
# Initialize MQTT interface with the esp interface
80-
MQTT.set_socket(socket, esp)
80+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
8181

8282
# Initialize a new MQTT Client object
8383
mqtt_client = MQTT.MQTT(
8484
broker="io.adafruit.com",
8585
username=secrets["aio_username"],
8686
password=secrets["aio_key"],
87+
socket_pool=pool,
88+
ssl_context=ssl_context,
8789
)
8890

8991

‎FunHouse_IOT_Hub/relay_heatindex_peripheral/code.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
import board
2121
import busio
22+
import adafruit_connection_manager
2223
from adafruit_esp32spi import adafruit_esp32spi
2324
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
24-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
25+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
2526
import neopixel
2627
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2728
from adafruit_io.adafruit_io import IO_MQTT
@@ -75,14 +76,15 @@ def on_hi(client, topic, message):
7576
wifi.connect()
7677
print("Connected!")
7778

78-
# Initialize MQTT interface with the esp interface
79-
MQTT.set_socket(socket, esp)
79+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
8080

8181
# Initialize a new MQTT Client object
8282
mqtt_client = MQTT.MQTT(
8383
broker="io.adafruit.com",
8484
username=secrets["aio_username"],
8585
password=secrets["aio_key"],
86+
socket_pool=pool,
87+
ssl_context=ssl_context,
8688
)
8789

8890

‎FunHouse_IOT_Hub/relay_peripheral/code.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
"""
1515
import board
1616
import busio
17+
import adafruit_connection_manager
1718
from adafruit_esp32spi import adafruit_esp32spi
1819
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
19-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
20+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
2021
import neopixel
2122
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2223
from adafruit_io.adafruit_io import IO_MQTT
@@ -69,14 +70,15 @@ def on_lamp(client, topic, message):
6970
wifi.connect()
7071
print("Connected!")
7172

72-
# Initialize MQTT interface with the esp interface
73-
MQTT.set_socket(socket, esp)
73+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
7474

7575
# Initialize a new MQTT Client object
7676
mqtt_client = MQTT.MQTT(
7777
broker="io.adafruit.com",
7878
username=secrets["aio_username"],
7979
password=secrets["aio_key"],
80+
socket_pool=pool,
81+
ssl_context=ssl_context,
8082
)
8183

8284

‎MagTag/MagTag_Webb_Telescope_Status/code.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import wifi
1717
import socketpool
1818
import alarm
19-
import adafruit_requests as requests
19+
import adafruit_requests
2020

2121
try:
2222
from secrets import secrets
@@ -70,7 +70,7 @@ def try_refresh():
7070

7171
# Create Socket, initialize requests
7272
socket = socketpool.SocketPool(wifi.radio)
73-
requests = requests.Session(socket, ssl.create_default_context())
73+
requests = adafruit_requests.Session(socket, ssl.create_default_context())
7474
except OSError:
7575
print("Failed to connect to AP. Rebooting in 3 seconds...")
7676
time.sleep(3)

‎MagTag/MagTag_Webb_Telescope_Status/deprecated_original_version/code.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import wifi
1717
import socketpool
1818
import alarm
19-
import adafruit_requests as requests
19+
import adafruit_requests
2020

2121
try:
2222
from secrets import secrets
@@ -68,7 +68,7 @@ def try_refresh():
6868

6969
# Create Socket, initialize requests
7070
socket = socketpool.SocketPool(wifi.radio)
71-
requests = requests.Session(socket, ssl.create_default_context())
71+
requests = adafruit_requests.Session(socket, ssl.create_default_context())
7272
except OSError:
7373
print("Failed to connect to AP. Rebooting in 3 seconds...")
7474
time.sleep(3)

‎Metro_M7_Examples/WiFi/code.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import board
66
import busio
77
from digitalio import DigitalInOut
8-
import adafruit_requests as requests
9-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
8+
import adafruit_connection_manager
9+
import adafruit_requests
10+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1011
from adafruit_esp32spi import adafruit_esp32spi
1112

1213
print("ESP32 SPI webclient test")
@@ -22,7 +23,9 @@
2223
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
2324
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
2425

25-
requests.set_socket(socket, esp)
26+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
27+
28+
requests = adafruit_requests.Session(pool, ssl_context)
2629

2730
if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
2831
print("ESP32 found and in idle mode")

‎PyPortal/PyPortal_AWS_IOT_Planter/code.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import busio
1717
from digitalio import DigitalInOut
1818
import neopixel
19+
import adafruit_connection_manager
1920
from adafruit_esp32spi import adafruit_esp32spi
2021
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
21-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
22+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
2223
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2324
from adafruit_aws_iot import MQTT_CLIENT
2425
from adafruit_seesaw.seesaw import Seesaw
@@ -86,8 +87,7 @@
8687
wifi.connect()
8788
print("Connected!")
8889

89-
# Initialize MQTT interface with the esp interface
90-
MQTT.set_socket(socket, esp)
90+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
9191

9292
# Soil Sensor Setup
9393
i2c_bus = busio.I2C(board.SCL, board.SDA)
@@ -128,7 +128,9 @@ def message(client, topic, msg):
128128

129129
# Set up a new MiniMQTT Client
130130
client = MQTT.MQTT(broker = secrets['broker'],
131-
client_id = secrets['client_id'])
131+
client_id = secrets['client_id'],
132+
socket_pool=pool,
133+
ssl_context=ssl_context)
132134

133135
# Initialize AWS IoT MQTT API Client
134136
aws_iot = MQTT_CLIENT(client)

0 commit comments

Comments
 (0)