Renamed a global from socket.

Author: BiffoBear

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -82,10 +82,10 @@
 _SNSR_SOCK_SYNSENT = const(0x15)
 SNSR_SOCK_SYNRECV = const(0x16)
 SNSR_SOCK_ESTABLISHED = const(0x17)
-_SNSR_SOCK_FIN_WAIT = const(0x18)
+SNSR_SOCK_FIN_WAIT = const(0x18)
 _SNSR_SOCK_CLOSING = const(0x1A)
-_SNSR_SOCK_TIME_WAIT = const(0x1B)
-_SNSR_SOCK_CLOSE_WAIT = const(0x1C)
+SNSR_SOCK_TIME_WAIT = const(0x1B)
+SNSR_SOCK_CLOSE_WAIT = const(0x1C)
 _SNSR_SOCK_LAST_ACK = const(0x1D)
 _SNSR_SOCK_UDP = const(0x22)
 _SNSR_SOCK_IPRAW = const(0x32)
@@ -814,9 +814,9 @@ def socket_open(self, socket_num: int, conn_mode: int = _SNMR_TCP) -> int:
         status = self._read_snsr(socket_num)[0]
         if status in (
             SNSR_SOCK_CLOSED,
-            _SNSR_SOCK_TIME_WAIT,
-            _SNSR_SOCK_FIN_WAIT,
-            _SNSR_SOCK_CLOSE_WAIT,
+            SNSR_SOCK_TIME_WAIT,
+            SNSR_SOCK_FIN_WAIT,
+            SNSR_SOCK_CLOSE_WAIT,
             _SNSR_SOCK_CLOSING,
             _SNSR_SOCK_UDP,
         ):
@@ -893,7 +893,7 @@ def socket_read(
         if ret == 0:
             # no data on socket?
             status = self._read_snmr(socket_num)
-            if status in (SNSR_SOCK_LISTEN, SNSR_SOCK_CLOSED, _SNSR_SOCK_CLOSE_WAIT):
+            if status in (SNSR_SOCK_LISTEN, SNSR_SOCK_CLOSED, SNSR_SOCK_CLOSE_WAIT):
                 # remote end closed its side of the connection, EOF state
                 ret = 0
                 resp = 0
@@ -993,7 +993,7 @@ def socket_write(
         while free_size < ret:
             free_size = self._get_tx_free_size(socket_num)
             status = self.socket_status(socket_num)[0]
-            if status not in (SNSR_SOCK_ESTABLISHED, _SNSR_SOCK_CLOSE_WAIT) or (
+            if status not in (SNSR_SOCK_ESTABLISHED, SNSR_SOCK_CLOSE_WAIT) or (
                 timeout and time.monotonic() - stamp > timeout
             ):
                 ret = 0
@@ -1038,9 +1038,9 @@ def socket_write(
         ) != _SNIR_SEND_OK:
             if self.socket_status(socket_num)[0] in (
                 SNSR_SOCK_CLOSED,
-                _SNSR_SOCK_TIME_WAIT,
-                _SNSR_SOCK_FIN_WAIT,
-                _SNSR_SOCK_CLOSE_WAIT,
+                SNSR_SOCK_TIME_WAIT,
+                SNSR_SOCK_FIN_WAIT,
+                SNSR_SOCK_CLOSE_WAIT,
                 _SNSR_SOCK_CLOSING,
             ) or (timeout and time.monotonic() - stamp > timeout):
                 # self.socket_close(socket_num)

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

@@ -69,11 +69,11 @@ def htons(x: int) -> int:
     return (((x) << 8) & 0xFF00) | (((x) >> 8) & 0xFF)
 
 
-SOCK_STREAM = const(0x21)  # TCP
-TCP_MODE = 80
+_SOCK_STREAM = const(0x21)  # TCP
+_TCP_MODE = 80
 SOCK_DGRAM = const(0x02)  # UDP
-AF_INET = const(3)
-SOCKET_INVALID = const(255)
+_AF_INET = const(3)
+_SOCKET_INVALID = const(255)
 
 
 # pylint: disable=too-many-arguments, unused-argument
@@ -103,8 +103,8 @@ def getaddrinfo(
     if not isinstance(port, int):
         raise RuntimeError("Port must be an integer")
     if is_ipv4(host):
-        return [(AF_INET, socktype, proto, "", (host, port))]
-    return [(AF_INET, socktype, proto, "", (gethostbyname(host), port))]
+        return [(_AF_INET, socktype, proto, "", (host, port))]
+    return [(_AF_INET, socktype, proto, "", (gethostbyname(host), port))]
 
 
 def gethostbyname(hostname: str) -> str:
@@ -147,8 +147,8 @@ class socket:
     # pylint: disable=redefined-builtin,unused-argument
     def __init__(
         self,
-        family: int = AF_INET,
-        type: int = SOCK_STREAM,
+        family: int = _AF_INET,
+        type: int = _SOCK_STREAM,
         proto: int = 0,
         fileno: Optional[int] = None,
         socknum: Optional[int] = None,
@@ -161,25 +161,25 @@ def __init__(
         :param Optional[int] fileno: Unused, retained for compatibility.
         :param Optional[int] socknum: Unused, retained for compatibility.
         """
-        if family != AF_INET:
+        if family != _AF_INET:
             raise RuntimeError("Only AF_INET family supported by W5K modules.")
         self._sock_type = type
         self._buffer = b""
         self._timeout = 0
         self._listen_port = None
 
         self._socknum = _the_interface.get_socket()
-        if self._socknum == SOCKET_INVALID:
+        if self._socknum == _SOCKET_INVALID:
             raise RuntimeError("Failed to allocate socket.")
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:
-        if self._sock_type == SOCK_STREAM:
+        if self._sock_type == _SOCK_STREAM:
             self.disconnect()
             stamp = time.monotonic()
-            while self.status == wiznet5k.adafruit_wiznet5k._SNSR_SOCK_FIN_WAIT:
+            while self.status == wiznet5k.adafruit_wiznet5k.SNSR_SOCK_FIN_WAIT:
                 if time.monotonic() - stamp > 1000:
                     raise RuntimeError("Failed to disconnect socket")
         self.close()
@@ -219,16 +219,16 @@ def connected(self) -> bool:
             return False
         status = _the_interface.socket_status(self.socknum)[0]
         if (
-            status == wiznet5k.adafruit_wiznet5k._SNSR_SOCK_CLOSE_WAIT
+            status == wiznet5k.adafruit_wiznet5k.SNSR_SOCK_CLOSE_WAIT
             and self.available() == 0
         ):
             result = False
         else:
             result = status not in (
                 wiznet5k.adafruit_wiznet5k.SNSR_SOCK_CLOSED,
                 wiznet5k.adafruit_wiznet5k.SNSR_SOCK_LISTEN,
-                wiznet5k.adafruit_wiznet5k._SNSR_SOCK_TIME_WAIT,
-                wiznet5k.adafruit_wiznet5k._SNSR_SOCK_FIN_WAIT,
+                wiznet5k.adafruit_wiznet5k.SNSR_SOCK_TIME_WAIT,
+                wiznet5k.adafruit_wiznet5k.SNSR_SOCK_FIN_WAIT,
             )
         if not result and status != wiznet5k.adafruit_wiznet5k.SNSR_SOCK_LISTEN:
             self.close()
@@ -405,7 +405,7 @@ def recv(
             while True:
                 avail = self.available()
                 if avail:
-                    if self._sock_type == SOCK_STREAM:
+                    if self._sock_type == _SOCK_STREAM:
                         self._buffer += _the_interface.socket_read(self.socknum, avail)[
                             1
                         ]
@@ -427,7 +427,7 @@ def recv(
             avail = self.available()
             if avail:
                 stamp = time.monotonic()
-                if self._sock_type == SOCK_STREAM:
+                if self._sock_type == _SOCK_STREAM:
                     recv = _the_interface.socket_read(
                         self.socknum, min(to_read, avail)
                     )[1]
@@ -468,7 +468,7 @@ def embed_recv(
         ret = None
         avail = self.available()
         if avail:
-            if self._sock_type == SOCK_STREAM:
+            if self._sock_type == _SOCK_STREAM:
                 self._buffer += _the_interface.socket_read(self.socknum, avail)[1]
             elif self._sock_type == SOCK_DGRAM:
                 self._buffer += _the_interface.read_udp(self.socknum, avail)[1]
@@ -550,7 +550,7 @@ def readline(self) -> bytes:
         while b"\r\n" not in self._buffer:
             avail = self.available()
             if avail:
-                if self._sock_type == SOCK_STREAM:
+                if self._sock_type == _SOCK_STREAM:
                     self._buffer += _the_interface.socket_read(self.socknum, avail)[1]
                 elif self._sock_type == SOCK_DGRAM:
                     self._buffer += _the_interface.read_udp(self.socknum, avail)[1]
@@ -567,7 +567,7 @@ def readline(self) -> bytes:
 
     def disconnect(self) -> None:
         """Disconnect a TCP socket."""
-        assert self._sock_type == SOCK_STREAM, "Socket must be a TCP socket."
+        assert self._sock_type == _SOCK_STREAM, "Socket must be a TCP socket."
         _the_interface.socket_disconnect(self.socknum)
 
     def close(self) -> None: