Standardised on Optional. Added __future__ as required. All modules import. Added # pylint: disable=cyclic-import

Author: BiffoBear

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -645,7 +645,7 @@ def socket_available(self, socket_num: int, sock_type: int = SNMR_TCP) -> int:
                 return ret
         return 0
 
-    def socket_status(self, socket_num: int) -> Union[bytearray, None]:
+    def socket_status(self, socket_num: int) -> Optional[bytearray]:
         """
         Return the socket connection status.
 
@@ -656,7 +656,7 @@ def socket_status(self, socket_num: int) -> Union[bytearray, None]:
 
         :param int socket_num: ID of socket to check.
 
-        :return: Union[bytearray, None]
+        :return: Optional[bytearray]
         """
         return self._read_snsr(socket_num)
 
@@ -1087,12 +1087,12 @@ def _read_sntx_wr(self, sock: int) -> int:
         self._pbuff[1] = self._read_socket(sock, 0x0024 + 1)[0]
         return self._pbuff[0] << 8 | self._pbuff[1]
 
-    def _read_sntx_fsr(self, sock: int) -> Union[bytearray, None]:
+    def _read_sntx_fsr(self, sock: int) -> Optional[bytearray]:
         data = self._read_socket(sock, REG_SNTX_FSR)
         data += self._read_socket(sock, REG_SNTX_FSR + 1)
         return data
 
-    def _read_snrx_rsr(self, sock: int) -> Union[bytearray, None]:
+    def _read_snrx_rsr(self, sock: int) -> Optional[bytearray]:
         data = self._read_socket(sock, REG_SNRX_RSR)
         data += self._read_socket(sock, REG_SNRX_RSR + 1)
         return data
@@ -1107,7 +1107,7 @@ def _write_sndport(self, sock: int, port: int) -> None:
         self._write_socket(sock, REG_SNDPORT, port >> 8)
         self._write_socket(sock, REG_SNDPORT + 1, port & 0xFF)
 
-    def _read_snsr(self, sock: int) -> Union[bytearray, None]:
+    def _read_snsr(self, sock: int) -> Optional[bytearray]:
         """Read Socket n Status Register."""
         return self._read_socket(sock, REG_SNSR)
 
@@ -1127,10 +1127,10 @@ def _write_sock_port(self, sock: int, port: int) -> None:
     def _write_sncr(self, sock: int, data: int) -> None:
         self._write_socket(sock, REG_SNCR, data)
 
-    def _read_sncr(self, sock: int) -> Union[bytearray, None]:
+    def _read_sncr(self, sock: int) -> Optional[bytearray]:
         return self._read_socket(sock, REG_SNCR)
 
-    def _read_snmr(self, sock: int) -> Union[bytearray, None]:
+    def _read_snmr(self, sock: int) -> Optional[bytearray]:
         return self._read_socket(sock, REG_SNMR)
 
     def _write_socket(self, sock: int, address: int, data: int) -> None:
@@ -1145,7 +1145,7 @@ def _write_socket(self, sock: int, address: int, data: int) -> None:
             )
         return None
 
-    def _read_socket(self, sock: int, address: int) -> Union[bytearray, None]:  # *1
+    def _read_socket(self, sock: int, address: int) -> Optional[bytearray]:  # *1
         """Read a W5k socket register."""
         if self._chip_type == "w5500":
             cntl_byte = (sock << 5) + 0x08

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

@@ -13,9 +13,13 @@
 * Author(s): Jordan Terrell, Brent Rubell
 
 """
+from __future__ import annotations
+
 try:
     from typing import Optional, Union, Tuple, Sequence
 
+    # pylint: disable=cyclic-import
+    from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
 except ImportError:
     pass
 
@@ -90,7 +94,7 @@ class DHCP:
     # pylint: disable=too-many-arguments, too-many-instance-attributes, invalid-name
     def __init__(
         self,
-        eth,
+        eth: WIZNET5K,
         mac_address: Sequence[Union[int, bytes]],
         hostname: Optional[str] = None,
         response_timeout: float = 30,

adafruit_wiznet5k/adafruit_wiznet5k_dns.py

@@ -13,8 +13,13 @@
 * Author(s): MCQN Ltd, Brent Rubell
 
 """
+from __future__ import annotations
+
 try:
     from typing import Union, Tuple
+
+    # pylint: disable=cyclic-import
+    from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
 except ImportError:
     pass
 
@@ -24,7 +29,6 @@
 import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
 from adafruit_wiznet5k.adafruit_wiznet5k_socket import htons
 
-
 QUERY_FLAG = const(0x00)
 OPCODE_STANDARD_QUERY = const(0x00)
 RECURSION_DESIRED_FLAG = 1 << 8
@@ -48,7 +52,7 @@ class DNS:
 
     def __init__(
         self,
-        iface,
+        iface: WIZNET5K,
         dns_address: Union[str, Tuple[int, int, int, int]],
         debug: bool = False,
     ) -> None:

adafruit_wiznet5k/adafruit_wiznet5k_ntp.py

@@ -17,8 +17,11 @@
 
 
 """
+from __future__ import annotations
+
 try:
     import typing  # pylint: disable=unused-import
+    from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
 except ImportError:
     pass
 import time
@@ -33,7 +36,7 @@ class NTP:
 
     def __init__(
         self,
-        iface,
+        iface: WIZNET5K,
         ntp_address: str,
         utc: int,
         debug: bool = False,

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

@@ -12,8 +12,13 @@
 * Author(s): ladyada, Brent Rubell, Patrick Van Oosterwijck, Adam Cummick
 
 """
+from __future__ import annotations
+
 try:
     from typing import Any, Optional, Tuple, List, Union
+
+    # pylint: disable=cyclic-import
+    from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
 except ImportError:
     pass
 
@@ -24,10 +29,10 @@
 import adafruit_wiznet5k as wiznet5k
 
 # pylint: disable=invalid-name
-_the_interface: Union[wiznet5k.adafruit_wiznet5k.WIZNET5K, None] = None
+_the_interface: Optional[WIZNET5K] = None
 
 
-def set_interface(iface: wiznet5k.adafruit_wiznet5k.WIZNET5K) -> None:
+def set_interface(iface: WIZNET5K) -> None:
     """
     Helper to set the global internet interface.
 
@@ -282,12 +287,8 @@ def listen(self, backlog: Optional[Any] = None) -> None:
 
     def accept(
         self,
-    ) -> Optional[
-        Tuple[
-            wiznet5k.adafruit_wiznet5k_socket.socket,
-            Tuple[Union[str, bytearray], Union[int, bytearray]],
-        ]
-    ]:
+    ) -> Optional[Tuple[socket, Tuple[Union[str, bytearray], Union[int, bytearray]],]]:
+        # wiznet5k.adafruit_wiznet5k_socket.socket,
         """
         Accept a connection.
 
@@ -297,7 +298,7 @@ def accept(
         socket object to send and receive data on the connection, and address is
         the address bound to the socket on the other end of the connection.
 
-        :return Union[int, Tuple[int, Tuple[Union[str, bytearray], Union[int, bytearray]]], None]:
+        :return Optional[Tuple[socket.socket, Tuple[Union[str, bytearray], Union[int, bytearray]]]:
             If successful (socket object, (IP address, port)). If errors occur, the IP address
             and / or the port may be returned as bytearrays.
         """
@@ -583,7 +584,7 @@ def settimeout(self, value: float) -> None:
             raise Exception("Timeout period should be non-negative.")
         self._timeout = value
 
-    def gettimeout(self) -> Union[float, None]:
+    def gettimeout(self) -> Optional[float]:
         """
         Timeout associated with socket operations.
 

adafruit_wiznet5k/adafruit_wiznet5k_wsgiserver.py

@@ -27,8 +27,10 @@
 * Author(s): Matt Costi, Patrick Van Oosterwijck
 """
 # pylint: disable=no-name-in-module
+# from __future__ import annotations
 try:
     from typing import Optional, List, Tuple, Dict
+    from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
 except ImportError:
     pass
 
@@ -38,10 +40,10 @@
 import adafruit_wiznet5k as wiznet5k
 import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
 
-_the_interface = None  # pylint: disable=invalid-name
+_the_interface: Optional[WIZNET5K] = None  # pylint: disable=invalid-name
 
 
-def set_interface(iface) -> None:
+def set_interface(iface: WIZNET5K) -> None:
     """
     Helper to set the global internet interface.
 
@@ -217,10 +219,10 @@ def _get_environ(self, client: socket.socket) -> Dict:
         if "content-length" in headers:
             env["CONTENT_LENGTH"] = headers.get("content-length")
             body = client.recv(int(env["CONTENT_LENGTH"]))
-            env["wsgi.input"] = io.StringIO(body)  # TODO: Is bytes should be str
+            env["wsgi.input"] = io.StringIO(body)
         else:
             body = client.recv()
-            env["wsgi.input"] = io.StringIO(body)  # TODO: Is bytes should be str
+            env["wsgi.input"] = io.StringIO(body)
         for name, value in headers.items():
             key = "HTTP_" + name.replace("-", "_").upper()
             if key in env: