Skip to content

Commit c9ad360

Browse files
authored
Merge pull request #118 from justmobilize/fix-get-radio-ssl-context
Fix get_radio_ssl_context
2 parents 08e00bd + d7bd8c3 commit c9ad360

16 files changed

+32
-32
lines changed

examples/adafruit_io_http/adafruit_io_analog_in.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from analogio import AnalogIn
1010
from digitalio import DigitalInOut
1111
import adafruit_connection_manager
12-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1312
from adafruit_esp32spi import adafruit_esp32spi
1413
import adafruit_requests
1514
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
@@ -47,7 +46,8 @@
4746
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4847

4948
# Initialize a requests session
50-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
49+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
50+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
5151
requests = adafruit_requests.Session(pool, ssl_context)
5252

5353
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_digital_out.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import busio
99
from digitalio import DigitalInOut, Direction
1010
import adafruit_connection_manager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1211
from adafruit_esp32spi import adafruit_esp32spi
1312
import adafruit_requests
1413
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
@@ -46,7 +45,8 @@
4645
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4746

4847
# Initialize a requests session
49-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
48+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
49+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
5050
requests = adafruit_requests.Session(pool, ssl_context)
5151

5252
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_feeds.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import busio
99
from digitalio import DigitalInOut
1010
import adafruit_connection_manager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1211
from adafruit_esp32spi import adafruit_esp32spi
1312
import adafruit_requests
1413
from adafruit_io.adafruit_io import IO_HTTP
@@ -46,7 +45,8 @@
4645
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4746

4847
# Initialize a requests session
49-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
48+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
49+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
5050
requests = adafruit_requests.Session(pool, ssl_context)
5151

5252
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_groups.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import busio
99
from digitalio import DigitalInOut
1010
import adafruit_connection_manager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1211
from adafruit_esp32spi import adafruit_esp32spi
1312
import adafruit_requests
1413
from adafruit_io.adafruit_io import IO_HTTP
@@ -47,7 +46,8 @@
4746
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4847

4948
# Initialize a requests session
50-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
49+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
50+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
5151
requests = adafruit_requests.Session(pool, ssl_context)
5252

5353
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_metadata.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import busio
88
from digitalio import DigitalInOut
99
import adafruit_connection_manager
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1110
from adafruit_esp32spi import adafruit_esp32spi
1211
import adafruit_requests
1312
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
@@ -45,7 +44,8 @@
4544
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4645

4746
# Initialize a requests session
48-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
47+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
48+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
4949
requests = adafruit_requests.Session(pool, ssl_context)
5050

5151
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_randomizer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import busio
99
from digitalio import DigitalInOut
1010
import adafruit_connection_manager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1211
from adafruit_esp32spi import adafruit_esp32spi
1312
import adafruit_requests
1413
from adafruit_io.adafruit_io import IO_HTTP
@@ -46,7 +45,8 @@
4645
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4746

4847
# Initialize a requests session
49-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
48+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
49+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
5050
requests = adafruit_requests.Session(pool, ssl_context)
5151

5252
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_simpletest_esp32spi.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import busio
88
from digitalio import DigitalInOut
99
import adafruit_connection_manager
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1110
from adafruit_esp32spi import adafruit_esp32spi
1211
import adafruit_requests
1312
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
@@ -45,7 +44,8 @@
4544
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4645

4746
# Initialize a requests session
48-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
47+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
48+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
4949
requests = adafruit_requests.Session(pool, ssl_context)
5050

5151
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_temperature.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import busio
99
from digitalio import DigitalInOut
1010
import adafruit_connection_manager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1211
from adafruit_esp32spi import adafruit_esp32spi
1312
import adafruit_requests
1413
import adafruit_adt7410
@@ -47,7 +46,8 @@
4746
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4847

4948
# Initialize a requests session
50-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
49+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
50+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
5151
requests = adafruit_requests.Session(pool, ssl_context)
5252

5353
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_http/adafruit_io_weather.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import busio
88
from digitalio import DigitalInOut
99
import adafruit_connection_manager
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1110
from adafruit_esp32spi import adafruit_esp32spi
1211
import adafruit_requests
1312
from adafruit_io.adafruit_io import IO_HTTP
@@ -45,7 +44,8 @@
4544
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4645

4746
# Initialize a requests session
48-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
47+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
48+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
4949
requests = adafruit_requests.Session(pool, ssl_context)
5050

5151
# Set your Adafruit IO Username and Key in secrets.py

examples/adafruit_io_mqtt/adafruit_io_feed_callback.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import adafruit_connection_manager
1010
from adafruit_esp32spi import adafruit_esp32spi
1111
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
12-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1312
import neopixel
1413
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1514
from adafruit_io.adafruit_io import IO_MQTT
@@ -95,7 +94,8 @@ def on_battery_msg(client, topic, message):
9594
wifi.connect()
9695
print("Connected!")
9796

98-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
97+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
98+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
9999

100100
# Initialize a new MQTT Client object
101101
mqtt_client = MQTT.MQTT(

examples/adafruit_io_mqtt/adafruit_io_groups.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import adafruit_connection_manager
1313
from adafruit_esp32spi import adafruit_esp32spi
1414
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
15-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1615
import neopixel
1716
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1817
from adafruit_io.adafruit_io import IO_MQTT
@@ -86,7 +85,8 @@ def message(client, feed_id, payload):
8685
wifi.connect()
8786
print("Connected!")
8887

89-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
88+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
89+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
9090

9191
# Initialize a new MQTT Client object
9292
mqtt_client = MQTT.MQTT(

examples/adafruit_io_mqtt/adafruit_io_location.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import adafruit_connection_manager
1111
from adafruit_esp32spi import adafruit_esp32spi
1212
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
13-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1413
import neopixel
1514

1615

@@ -86,7 +85,8 @@ def message(client, feed_id, payload):
8685
wifi.connect()
8786
print("Connected!")
8887

89-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
88+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
89+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
9090

9191
# Initialize a new MQTT Client object
9292
mqtt_client = MQTT.MQTT(

examples/adafruit_io_mqtt/adafruit_io_pubsub_rp2040.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import adafruit_connection_manager
1010
from adafruit_esp32spi import adafruit_esp32spi
1111
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
12-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1312
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1413
from adafruit_io.adafruit_io import IO_MQTT
1514

@@ -71,7 +70,8 @@ def on_led_msg(client, topic, message):
7170
wifi.connect()
7271
print("Connected!")
7372

74-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
73+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
74+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
7575

7676
# Initialize a new MQTT Client object
7777
mqtt_client = MQTT.MQTT(

examples/adafruit_io_mqtt/adafruit_io_simpletest_eth.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import adafruit_connection_manager
1616
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
17-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
1817
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1918
from adafruit_io.adafruit_io import IO_MQTT
2019

@@ -68,7 +67,8 @@ def message(client, feed_id, payload):
6867
print("Feed {0} received new value: {1}".format(feed_id, payload))
6968

7069

71-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
70+
pool = adafruit_connection_manager.get_radio_socketpool(eth)
71+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(eth)
7272

7373
# Initialize a new MQTT Client object
7474
mqtt_client = MQTT.MQTT(

examples/adafruit_io_mqtt/adafruit_io_time.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import adafruit_connection_manager
1212
from adafruit_esp32spi import adafruit_esp32spi
1313
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
14-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1514
import neopixel
1615

1716
import adafruit_minimqtt.adafruit_minimqtt as MQTT
@@ -100,7 +99,8 @@ def message(client, feed_id, payload):
10099
wifi.connect()
101100
print("Connected!")
102101

103-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
102+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
103+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
104104

105105
# Initialize a new MQTT Client object
106106
mqtt_client = MQTT.MQTT(

examples/adafruit_io_simpletest.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import adafruit_connection_manager
1616
from adafruit_esp32spi import adafruit_esp32spi
1717
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
18-
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1918
import neopixel
2019
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2120
from adafruit_io.adafruit_io import IO_MQTT
@@ -98,7 +97,8 @@ def message(client, feed_id, payload):
9897
wifi.connect()
9998
print("Connected!")
10099

101-
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
100+
pool = adafruit_connection_manager.get_radio_socketpool(esp)
101+
ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp)
102102

103103
# Initialize a new MQTT Client object
104104
mqtt_client = MQTT.MQTT(

0 commit comments

Comments
 (0)