Skip to content

Commit b2d5882

Browse files
author
BiffoBear
committed
Standardised all modules on __future__.annotations and typing.TYPE_CHECKING for pytest peace of mind.
1 parent d26b9e6 commit b2d5882

File tree

6 files changed

+33
-22
lines changed

6 files changed

+33
-22
lines changed

adafruit_wiznet5k/adafruit_wiznet5k.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,22 @@
2727
* Adafruit's Bus Device library: https://github.com/adafruit/Adafruit_CircuitPython_BusDevice
2828
"""
2929

30-
__version__ = "0.0.0+auto.0"
31-
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k.git"
32-
3330
# pylint: disable=too-many-lines
31+
from __future__ import annotations
32+
3433
try:
35-
from typing import Optional, Union, List, Tuple, Sequence
36-
from circuitpython_typing import WriteableBuffer
37-
import busio
38-
import digitalio
34+
from typing import TYPE_CHECKING, Optional, Union, List, Tuple, Sequence
35+
36+
if TYPE_CHECKING:
37+
from circuitpython_typing import WriteableBuffer
38+
import busio
39+
import digitalio
3940
except ImportError:
4041
pass
4142

43+
__version__ = "0.0.0+auto.0"
44+
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k.git"
45+
4246
from random import randint
4347
import time
4448
from micropython import const

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
from __future__ import annotations
1717

1818
try:
19-
from typing import Optional, Union, Tuple, Sequence
19+
from typing import TYPE_CHECKING, Optional, Union, Tuple, Sequence
2020

21-
# pylint: disable=cyclic-import
22-
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
21+
if TYPE_CHECKING:
22+
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
2323
except ImportError:
2424
pass
2525

26+
2627
import gc
2728
import time
2829
from random import randint

adafruit_wiznet5k/adafruit_wiznet5k_dns.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
from __future__ import annotations
1717

1818
try:
19-
from typing import Union, Tuple
19+
from typing import TYPE_CHECKING, Union, Tuple
2020

21-
# pylint: disable=cyclic-import
22-
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
21+
if TYPE_CHECKING:
22+
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
2323
except ImportError:
2424
pass
2525

adafruit_wiznet5k/adafruit_wiznet5k_ntp.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020
from __future__ import annotations
2121

2222
try:
23-
import typing # pylint: disable=unused-import
24-
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
23+
from typing import TYPE_CHECKING
24+
25+
if TYPE_CHECKING:
26+
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
2527
except ImportError:
2628
pass
2729
import time
2830
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
2931

30-
##__version__ = "0.0.0+auto.0"
31-
##__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_NTP.git"
32+
# __version__ = "0.0.0+auto.0"
33+
# __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_NTP.git"
3234

3335

3436
class NTP:

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
from __future__ import annotations
1616

1717
try:
18-
from typing import Any, Optional, Tuple, List, Union
18+
from typing import TYPE_CHECKING, Any, Optional, Tuple, List, Union
1919

20-
# pylint: disable=cyclic-import
21-
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
20+
if TYPE_CHECKING:
21+
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
2222
except ImportError:
2323
pass
2424

adafruit_wiznet5k/adafruit_wiznet5k_wsgiserver.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@
2727
* Author(s): Matt Costi, Patrick Van Oosterwijck
2828
"""
2929
# pylint: disable=no-name-in-module
30+
from __future__ import annotations
31+
3032
try:
31-
from typing import Optional, List, Tuple, Dict
32-
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
33+
from typing import TYPE_CHECKING, Optional, List, Tuple, Dict
34+
35+
if TYPE_CHECKING:
36+
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
3337
except ImportError:
3438
pass
3539

0 commit comments

Comments
 (0)