From d3ba70ac87841bc3ac5fba7e1f157212614c9d39 Mon Sep 17 00:00:00 2001 From: Alec Delaney <89490472+tekktrik@users.noreply.github.com> Date: Tue, 3 May 2022 09:55:42 -0400 Subject: [PATCH 1/2] Fix import of Protocol in adafruit_espatcontrol_wifimanager.py Allows for import of `Protocol` in Python 3.7, which has it in `typing_extensions` --- adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py b/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py index 30a6b3b..7ed5b9d 100755 --- a/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py +++ b/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py @@ -18,7 +18,12 @@ try: from adafruit_espatcontrol.adafruit_espatcontrol import ESP_ATcontrol - from typing import Dict, Protocol, Any, Optional, Union, Tuple + from typing import Dict, Any, Optional, Union, Tuple + + try: + from typing import Protocol + except ImportError: + from typing_extensions import Protocol class Pixel(Protocol): """ From ffae8c4c924cd154afc6d9d9c8f673cb720594b0 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 3 May 2022 11:31:20 -0500 Subject: [PATCH 2/2] code format --- adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py b/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py index b51fbf1..f57b5fe 100755 --- a/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py +++ b/adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py @@ -18,6 +18,7 @@ try: from typing import Dict, Any, Optional, Union, Tuple + try: from typing import Protocol except ImportError: