Skip to content

Commit cfc1006

Browse files
committed
Merge branch 'main' into dev/allow-37-protocol
# Conflicts: # adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py
2 parents d3ba70a + 31b7388 commit cfc1006

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

adafruit_espatcontrol/adafruit_espatcontrol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
from digitalio import Direction, DigitalInOut
3838

3939
try:
40-
import busio
4140
from typing import Optional, Dict, Union, List
41+
import busio
4242
except ImportError:
4343
pass
4444

adafruit_espatcontrol/adafruit_espatcontrol_socket.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from micropython import const
77

88
try:
9-
from .adafruit_espatcontrol import ESP_ATcontrol
109
from typing import Optional, Tuple, List
10+
from .adafruit_espatcontrol import ESP_ATcontrol
1111
except ImportError:
1212
pass
1313

adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
import adafruit_espatcontrol.adafruit_espatcontrol_socket as socket
1818

1919
try:
20-
from adafruit_espatcontrol.adafruit_espatcontrol import ESP_ATcontrol
2120
from typing import Dict, Any, Optional, Union, Tuple
22-
2321
try:
2422
from typing import Protocol
2523
except ImportError:
2624
from typing_extensions import Protocol
25+
from adafruit_espatcontrol.adafruit_espatcontrol import ESP_ATcontrol
2726

2827
class Pixel(Protocol):
2928
"""

0 commit comments

Comments
 (0)