Split listen to bind/listen for compatibility, formatting fixes

- The socket now expects `bind`, then `listen` for improved
  compatibility with CPython socket.
- Fixed formatting to make black happy, even did the extremely ugly
  thing on line 222 of adafruit_wiznet5k_socket.py.

Author: xorbit

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -574,9 +574,7 @@ def get_socket(self):
         sock = 0
         for _sock in range(self.max_sockets):
             status = self.socket_status(_sock)[0]
-            if (status in
-                (SNSR_SOCK_CLOSED, SNSR_SOCK_FIN_WAIT, SNSR_SOCK_CLOSE_WAIT)
-            ):
+            if status in (SNSR_SOCK_CLOSED, SNSR_SOCK_FIN_WAIT, SNSR_SOCK_CLOSE_WAIT):
                 sock = _sock
                 break
 
@@ -592,7 +590,7 @@ def socket_listen(self, socket_num, port):
         assert self.link_status, "Ethernet cable disconnected!"
         if self._debug:
             print(
-                    "* Listening on port={}, ip={}".format(
+                "* Listening on port={}, ip={}".format(
                     port, self.pretty_ip(self.ip_address)
                 )
             )
@@ -610,7 +608,6 @@ def socket_listen(self, socket_num, port):
             if status[0] == SNSR_SOCK_CLOSED:
                 raise RuntimeError("Listening socket closed.")
 
-
     def socket_open(self, socket_num, conn_mode=SNMR_TCP):
         """Opens a TCP or UDP socket. By default, we use
         'conn_mode'=SNMR_TCP but we may also use SNMR_UDP.
@@ -757,8 +754,10 @@ def socket_write(self, socket_num, buffer):
         while (
             self._read_socket(socket_num, REG_SNIR)[0] & SNIR_SEND_OK
         ) != SNIR_SEND_OK:
-            if (self.socket_status(socket_num)[0] in
-                (SNSR_SOCK_CLOSED, SNSR_SOCK_FIN_WAIT, SNSR_SOCK_CLOSE_WAIT)
+            if self.socket_status(socket_num)[0] in (
+                SNSR_SOCK_CLOSED,
+                SNSR_SOCK_FIN_WAIT,
+                SNSR_SOCK_CLOSE_WAIT,
             ):
                 # self.socket_close(socket_num)
                 return 0

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

@@ -120,6 +120,7 @@ def __init__(
         self._sock_type = type
         self._buffer = b""
         self._timeout = 0
+        self._listen_port = None
 
         self._socknum = _the_interface.get_socket()
 
@@ -134,8 +135,7 @@ def connected(self):
         if self.socknum >= _the_interface.max_sockets:
             return False
         status = _the_interface.socket_status(self.socknum)[0]
-        if (status == adafruit_wiznet5k.SNSR_SOCK_CLOSE_WAIT
-                and self.available() == 0):
+        if status == adafruit_wiznet5k.SNSR_SOCK_CLOSE_WAIT and self.available() == 0:
             result = False
         else:
             result = status not in (
@@ -162,11 +162,18 @@ def inet_aton(self, ip_string):
         self._buffer = bytearray(self._buffer)
         return self._buffer
 
-    def listen(self, port):
-        """Listen on the specified port.
-        :param int port: The port to listen on.
+    def bind(self, address):
+        """Bind the socket to the listen port, we ignore the host.
+        :param tuple address: local socket as a (host, port) tuple, host is ignored.
         """
-        _the_interface.socket_listen(self.socknum, port)
+        _, self._listen_port = address
+
+    def listen(self, backlog=None):
+        """Listen on the port specified by bind.
+        :param backlog: For compatibility but ignored.
+        """
+        assert self._listen_port is not None, "Use bind to set the port before listen!"
+        _the_interface.socket_listen(self.socknum, self._listen_port)
         self._buffer = b""
 
     def connect(self, address, conntype=None):
@@ -211,11 +218,11 @@ def recv(self, bufsize=0):  # pylint: disable=too-many-branches
                     avail = _the_interface.udp_remaining()
                 if avail:
                     if self._sock_type == SOCK_STREAM:
-                        self._buffer += _the_interface.socket_read(
-                                                  self.socknum, avail)[1]
+                        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]
+                        self._buffer += _the_interface.read_udp(self.socknum, avail)[1]
                 else:
                     break
             gc.collect()
@@ -237,10 +244,10 @@ def recv(self, bufsize=0):  # pylint: disable=too-many-branches
                 stamp = time.monotonic()
                 if self._sock_type == SOCK_STREAM:
                     recv = _the_interface.socket_read(
-                                self.socknum, min(to_read, avail))[1]
+                        self.socknum, min(to_read, avail)
+                    )[1]
                 elif self._sock_type == SOCK_DGRAM:
-                    recv = _the_interface.read_udp(
-                                self.socknum, min(to_read, avail))[1]
+                    recv = _the_interface.read_udp(self.socknum, min(to_read, avail))[1]
                 recv = bytes(recv)
                 received.append(recv)
                 to_read -= len(recv)
@@ -269,14 +276,16 @@ def readline(self):
             if self._sock_type == SOCK_STREAM:
                 avail = self.available()
                 if avail:
-                    self._buffer += _the_interface.socket_read(
-                                                  self.socknum, avail)[1]
+                    self._buffer += _the_interface.socket_read(self.socknum, avail)[1]
             elif self._sock_type == SOCK_DGRAM:
                 avail = _the_interface.udp_remaining()
                 if avail:
                     self._buffer += _the_interface.read_udp(self.socknum, avail)
-            if not avail and self._timeout > 0 and \
-                    time.monotonic() - stamp > self._timeout:
+            if (
+                not avail
+                and self._timeout > 0
+                and time.monotonic() - stamp > self._timeout
+            ):
                 self.close()
                 raise RuntimeError("Didn't receive response, failing out...")
         firstline, self._buffer = self._buffer.split(b"\r\n", 1)

adafruit_wiznet5k/adafruit_wiznet5k_wsgiserver.py

@@ -69,7 +69,8 @@ def start(self):
         """
         for _ in range(MAX_SOCK_NUM):
             new_sock = socket.socket()
-            new_sock.listen(self.port)
+            new_sock.bind((None, self.port))
+            new_sock.listen()
             self._client_sock.append(new_sock)
         if self._debug:
             ip = _the_interface.pretty_ip(_the_interface.ip_address)
@@ -89,7 +90,8 @@ def update_poll(self):
                 self.finish_response(result, sock)
                 self._client_sock.remove(sock)
                 new_sock = socket.socket()
-                new_sock.listen(self.port)
+                new_sock.bind((None, self.port))
+                new_sock.listen()
                 add_sock.append(new_sock)
         self._client_sock.extend(add_sock)