Skip to content

Commit 080ad9b

Browse files
authored
Merge pull request #146 from justmobilize/update-legacy-set-socket-examples
Update legacy set_socket examples
2 parents 3bd953e + bdd64a1 commit 080ad9b

6 files changed

+36
-23
lines changed

README.rst

+6-4
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ wifitest.adafruit.com.
6464
import board
6565
import busio
6666
import digitalio
67-
import adafruit_requests as requests
67+
import adafruit_connection_manager
68+
import adafruit_requests
6869
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
69-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
70+
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
7071
7172
print("Wiznet5k WebClient Test")
7273
@@ -79,8 +80,9 @@ wifitest.adafruit.com.
7980
# Initialize ethernet interface with DHCP
8081
eth = WIZNET5K(spi_bus, cs)
8182
82-
# Initialize a requests object with a socket and ethernet interface
83-
requests.set_socket(socket, eth)
83+
# Initialize a requests session
84+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
85+
requests = adafruit_requests.Session(pool, ssl_context)
8486
8587
print("Chip Version:", eth.chip)
8688
print("MAC Address:", [hex(i) for i in eth.mac_address])

examples/wiznet5k_aio_post.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
import board
66
import busio
77
from digitalio import DigitalInOut
8-
import adafruit_requests as requests
8+
import adafruit_connection_manager
9+
import adafruit_requests
910
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
10-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
11+
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
1112

1213
# Get Adafruit.io details from a secrets.py file
1314
try:
@@ -21,7 +22,9 @@
2122

2223
# Initialize ethernet interface with DHCP
2324
eth = WIZNET5K(spi_bus, cs)
24-
requests.set_socket(socket, eth)
25+
# Initialize a requests session
26+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
27+
requests = adafruit_requests.Session(pool, ssl_context)
2528

2629
counter = 0
2730

examples/wiznet5k_cheerlights.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@
66
import busio
77
from digitalio import DigitalInOut
88

9-
import adafruit_requests as requests
9+
import adafruit_connection_manager
10+
import adafruit_requests
1011

1112
import neopixel
1213
import adafruit_fancyled.adafruit_fancyled as fancy
1314
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
14-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
15+
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
1516

1617
cs = DigitalInOut(board.D10)
1718
spi_bus = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)
1819

1920
# Initialize ethernet interface with DHCP
2021
eth = WIZNET5K(spi_bus, cs)
2122

22-
# Initialize a requests object with a socket and ethernet interface
23-
requests.set_socket(socket, eth)
23+
# Initialize a requests session
24+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
25+
requests = adafruit_requests.Session(pool, ssl_context)
2426

2527
DATA_SOURCE = "http://api.thingspeak.com/channels/1417/feeds.json?results=1"
2628
DATA_LOCATION = ["feeds", 0, "field2"]

examples/wiznet5k_simpletest.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import board
55
import busio
66
import digitalio
7-
import adafruit_requests as requests
7+
import adafruit_connection_manager
8+
import adafruit_requests
89
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
9-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
10+
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
1011

1112
print("Wiznet5k WebClient Test")
1213

@@ -22,8 +23,9 @@
2223
# Initialize ethernet interface with DHCP
2324
eth = WIZNET5K(spi_bus, cs)
2425

25-
# Initialize a requests object with a socket and ethernet interface
26-
requests.set_socket(socket, eth)
26+
# Initialize a requests session
27+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
28+
requests = adafruit_requests.Session(pool, ssl_context)
2729

2830
print("Chip Version:", eth.chip)
2931
print("MAC Address:", [hex(i) for i in eth.mac_address])

examples/wiznet5k_simpletest_manual_network.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import board
55
import busio
66
import digitalio
7-
import adafruit_requests as requests
7+
import adafruit_connection_manager
8+
import adafruit_requests
89
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
9-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
10+
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
1011

1112
TEXT_URL = "http://wifitest.adafruit.com/testwifi/index.html"
1213

@@ -27,8 +28,9 @@
2728
# Set network configuration
2829
eth.ifconfig = (IP_ADDRESS, SUBNET_MASK, GATEWAY_ADDRESS, DNS_SERVER)
2930

30-
# Initialize a requests object with a socket and ethernet interface
31-
requests.set_socket(socket, eth)
31+
# Initialize a requests session
32+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
33+
requests = adafruit_requests.Session(pool, ssl_context)
3234

3335
print("Chip Version:", eth.chip)
3436
print("MAC Address:", [hex(i) for i in eth.mac_address])

examples/wiznet5k_wsgiserver.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
import digitalio
2222
import neopixel
2323

24-
import adafruit_requests as requests
24+
import adafruit_connection_manager
25+
import adafruit_requests
2526
from adafruit_wsgi.wsgi_app import WSGIApp
2627
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
27-
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
28+
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool
2829
import adafruit_wiznet5k.adafruit_wiznet5k_wsgiserver as server
2930

3031

@@ -76,8 +77,9 @@ def get_static_file(filename):
7677
# Initialize Ethernet interface with DHCP
7778
eth = WIZNET5K(spi_bus, cs, mac=mac)
7879

79-
# Initialize a requests object with a socket and ethernet interface
80-
requests.set_socket(socket, eth)
80+
# Initialize a requests session
81+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
82+
requests = adafruit_requests.Session(pool, ssl_context)
8183

8284

8385
# Here we create our application, registering the

0 commit comments

Comments
 (0)