Update all exceptions

Author: bill88t

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -188,7 +188,7 @@ def __init__(
         # attempt to initialize the module
         self._ch_base_msb = 0
         if self._w5100_init() != 1:
-            raise AssertionError("Failed to initialize WIZnet module.")
+            raise RuntimeError("Failed to initialize WIZnet module.")
         # Set MAC address
         self.mac_address = mac
         self.src_port = 0
@@ -216,7 +216,7 @@ def __init__(
             if ret != 0:
                 self._dhcp_client = None
             if ret != 0:
-                raise AssertionError("Failed to configure DHCP Server!")
+                raise RuntimeError("Failed to configure DHCP Server!")
 
     def set_dhcp(
         self, hostname: Optional[str] = None, response_timeout: float = 30
@@ -275,7 +275,7 @@ def get_host_by_name(self, hostname: str) -> bytes:
         if self._debug:
             print("* Resolved IP: ", ret)
         if ret == -1:
-            raise AssertionError("Failed to resolve hostname!")
+            raise RuntimeError("Failed to resolve hostname!")
         return ret
 
     @property
@@ -485,7 +485,7 @@ def detect_w5500(self) -> int:
         """
         self._chip_type = "w5500"
         if self.sw_reset() != 0:
-            raise AssertionError("Chip not reset properly!")
+            raise RuntimeError("Chip not reset properly!")
         self._write_mr(0x08)
         # assert self._read_mr()[0] == 0x08, "Expected 0x08."
         if self._read_mr()[0] != 0x08:
@@ -516,7 +516,7 @@ def detect_w5100s(self) -> int:
         self._chip_type = "w5100s"
         # sw reset
         if self.sw_reset() != 0:
-            raise AssertionError("Chip not reset properly!")
+            raise RuntimeError("Chip not reset properly!")
         if self.read(REG_VERSIONR_W5100S, 0x00)[0] != 0x51:
             return -1
 
@@ -629,7 +629,7 @@ def socket_available(self, socket_num: int, sock_type: int = SNMR_TCP) -> int:
                 )
             )
         if socket_num > self.max_sockets:
-            raise AssertionError("Provided socket exceeds max_sockets.")
+            raise ValueError("Provided socket exceeds max_sockets.")
 
         res = self._get_rx_rcv_size(socket_num)
 
@@ -683,7 +683,7 @@ def socket_connect(
             defaults to SNMR_TCP.
         """
         if not self.link_status:
-            raise AssertionError("Ethernet cable disconnected!")
+            raise ConnectionError("Ethernet cable disconnected!")
         if self._debug:
             print(
                 "* w5k socket connect, protocol={}, port={}, ip={}".format(
@@ -693,7 +693,7 @@ def socket_connect(
         # initialize a socket and set the mode
         res = self.socket_open(socket_num, conn_mode=conn_mode)
         if res == 1:
-            raise RuntimeError("Failed to initialize a connection with the socket.")
+            raise ConnectionError("Failed to initialize a connection with the socket.")
 
         # set socket destination IP and port
         self._write_sndipr(socket_num, dest)
@@ -707,7 +707,7 @@ def socket_connect(
                 if self._debug:
                     print("SN_SR:", self.socket_status(socket_num)[0])
                 if self.socket_status(socket_num)[0] == SNSR_SOCK_CLOSED:
-                    raise RuntimeError("Failed to establish connection.")
+                    raise ConnectionError("Failed to establish connection.")
         elif conn_mode == SNMR_UDP:
             self.udp_datasize[socket_num] = 0
         return 1
@@ -752,7 +752,7 @@ def socket_listen(
             UDP, defaults to SNMR_TCP.
         """
         if not self.link_status:
-            raise AssertionError("Ethernet cable disconnected!")
+            raise ConnectionError("Ethernet cable disconnected!")
         if self._debug:
             print(
                 "* Listening on port={}, ip={}".format(
@@ -813,7 +813,7 @@ def socket_open(self, socket_num: int, conn_mode: int = SNMR_TCP) -> int:
         :return int: 1 if the socket was opened, 0 if not.
         """
         if not self.link_status:
-            raise AssertionError("Ethernet cable disconnected!")
+            raise ConnectionError("Ethernet cable disconnected!")
         if self._debug:
             print("*** Opening socket %d" % socket_num)
         status = self._read_snsr(socket_num)[0]
@@ -846,7 +846,7 @@ def socket_open(self, socket_num: int, conn_mode: int = SNMR_TCP) -> int:
             self._write_sncr(socket_num, CMD_SOCK_OPEN)
             self._read_sncr(socket_num)
             if self._read_snsr((socket_num))[0] not in [0x13, 0x22]:
-                raise AssertionError("Could not open socket in TCP or UDP mode.")
+                raise RuntimeError("Could not open socket in TCP or UDP mode.")
             return 0
         return 1
 
@@ -888,9 +888,9 @@ def socket_read(  # pylint: disable=too-many-branches
         """
 
         if not self.link_status:
-            raise AssertionError("Ethernet cable disconnected!")
+            raise ConnectionError("Ethernet cable disconnected!")
         if socket_num > self.max_sockets:
-            raise AssertionError("Provided socket exceeds max_sockets.")
+            raise ValueError("Provided socket exceeds max_sockets.")
 
         # Check if there is data available on the socket
         ret = self._get_rx_rcv_size(socket_num)
@@ -984,7 +984,7 @@ def socket_write(
         :return int: The number of bytes written to the buffer.
         """
         if not self.link_status:
-            raise AssertionError("Ethernet cable disconnected!")
+            raise ConnectionError("Ethernet cable disconnected!")
         assert socket_num <= self.max_sockets, "Provided socket exceeds max_sockets."
         status = 0
         ret = 0

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

@@ -275,7 +275,7 @@ def parse_dhcp_response(
         # -- Parse Packet, FIXED -- #
         # Validate OP
         if _BUFF[0] != DHCP_BOOT_REPLY:
-            raise AssertionError(
+            raise RuntimeError(
                 "Malformed Packet - \
             DHCP message OP is not expected BOOT Reply."
             )

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

@@ -101,7 +101,7 @@ def getaddrinfo(
     :return List[Tuple[int, int, int, str, Tuple[str, int]]]: Address info entries.
     """
     if not isinstance(port, int):
-        raise RuntimeError("Port must be an integer")
+        raise ValueError("Port must be an integer")
     if is_ipv4(host):
         return [(AF_INET, socktype, proto, "", (host, port))]
     return [(AF_INET, socktype, proto, "", (gethostbyname(host), port))]
@@ -284,7 +284,7 @@ def listen(self, backlog: Optional[int] = None) -> None:
         :param Optional[int] backlog: Included for compatibility but ignored.
         """
         if self._listen_port is None:
-            raise AssertionError("Use bind to set the port before listen!")
+            raise RuntimeError("Use bind to set the port before listen!")
         _the_interface.socket_listen(self.socknum, self._listen_port)
         self._buffer = b""
 
@@ -342,7 +342,7 @@ def connect(
             to None.
         """
         if conntype == 0x03:
-            raise AssertionError(
+            raise NotImplementedError(
                 "Error: SSL/TLS is not currently supported by CircuitPython."
             )
         host, port = address
@@ -568,7 +568,7 @@ def readline(self) -> bytes:
     def disconnect(self) -> None:
         """Disconnect a TCP socket."""
         if self._sock_type != SOCK_STREAM:
-            raise AssertionError("Socket must be a TCP socket.")
+            raise RuntimeError("Socket must be a TCP socket.")
         _the_interface.socket_disconnect(self.socknum)
 
     def close(self) -> None: