lint, black, small tweaks

Author: AdamCummick

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -184,7 +184,8 @@ def __init__(
         self._dns = 0
 
         # First, wait link status is on
-        # to avoid the code during DHCP, socket listen, connect ... - assert self.link_status, "Ethernet cable disconnected!"
+        # to avoid the code during DHCP, socket listen, connect ...
+        # assert self.link_status, "Ethernet cable disconnected!"
         start_time = time.monotonic()
         while True:
             if self.link_status or ((time.monotonic() - start_time) > 5):
@@ -255,7 +256,7 @@ def max_sockets(self):
         """Returns max number of sockets supported by chip."""
         if self._chip_type == "w5500":
             return W5200_W5500_MAX_SOCK_NUM
-        elif self._chip_type == "w5100s":
+        if self._chip_type == "w5100s":
             return W5100_MAX_SOCK_NUM
         return -1
 
@@ -325,7 +326,7 @@ def link_status(self):
         if self._chip_type == "w5500":
             data = self.read(REG_PHYCFGR, 0x00)
             return data[0] & 0x01
-        elif self._chip_type == "w5100s":
+        if self._chip_type == "w5100s":
             data = self.read(REG_PHYCFGR_W5100S, 0x00)
             return data[0] & 0x01
         return 0
@@ -389,15 +390,18 @@ def detect_w5500(self):
         assert self.sw_reset() == 0, "Chip not reset properly!"
         self._write_mr(0x08)
         # assert self._read_mr()[0] == 0x08, "Expected 0x08."
-        if self._read_mr()[0] != 0x08 : return -1
+        if self._read_mr()[0] != 0x08:
+            return -1
 
         self._write_mr(0x10)
         # assert self._read_mr()[0] == 0x10, "Expected 0x10."
-        if self._read_mr()[0] != 0x10 : return -1
+        if self._read_mr()[0] != 0x10:
+            return -1
 
         self._write_mr(0x00)
         # assert self._read_mr()[0] == 0x00, "Expected 0x00."
-        if self._read_mr()[0] != 0x00 : return -1
+        if self._read_mr()[0] != 0x00:
+            return -1
 
         if self.read(REG_VERSIONR_W5500, 0x00)[0] != 0x04:
             return -1
@@ -452,8 +456,8 @@ def read(self, addr, callback, length=1, buffer=None):
                 bus_device.write(bytes([addr >> 8]))  # pylint: disable=no-member
                 bus_device.write(bytes([addr & 0xFF]))  # pylint: disable=no-member
                 bus_device.write(bytes([callback]))  # pylint: disable=no-member
-            else :
-            #if self._chip_type == "w5100s":
+            else:
+                # if self._chip_type == "w5100s":
                 bus_device.write(bytes([0x0F]))  # pylint: disable=no-member
                 bus_device.write(bytes([addr >> 8]))  # pylint: disable=no-member
                 bus_device.write(bytes([addr & 0xFF]))  # pylint: disable=no-member
@@ -478,8 +482,8 @@ def write(self, addr, callback, data):
                 bus_device.write(bytes([addr >> 8]))  # pylint: disable=no-member
                 bus_device.write(bytes([addr & 0xFF]))  # pylint: disable=no-member
                 bus_device.write(bytes([callback]))  # pylint: disable=no-member
-            else :
-            #if self._chip_type == "w5100s":
+            else:
+                # if self._chip_type == "w5100s":
                 bus_device.write(bytes([0xF0]))  # pylint: disable=no-member
                 bus_device.write(bytes([addr >> 8]))  # pylint: disable=no-member
                 bus_device.write(bytes([addr & 0xFF]))  # pylint: disable=no-member
@@ -735,18 +739,18 @@ def socket_read(self, socket_num, length):
                 ctrl_byte = 0x18 + (socket_num << 5)
 
                 resp = self.read(ptr, ctrl_byte, ret)
-            else :
-            #if self._chip_type == "w5100s":
+            else:
+                # if self._chip_type == "w5100s":
                 offset = ptr & SOCK_MASK
                 src_addr = offset + (socket_num * SOCK_SIZE + 0x6000)
-                if (offset + ret > SOCK_SIZE) :
+                if offset + ret > SOCK_SIZE:
                     size = SOCK_SIZE - offset
                     resp1 = self.read(src_addr, 0x00, size)
                     size = ret - size
-                    src_addr = (socket_num * SOCK_SIZE + 0x6000)
+                    src_addr = socket_num * SOCK_SIZE + 0x6000
                     resp2 = self.read(src_addr, 0x00, size)
                     resp = resp1 + resp2
-                else :
+                else:
                     resp = self.read(src_addr, 0x00, ret)
 
             #  After reading the received data, update Sn_RX_RD to the increased
@@ -800,24 +804,24 @@ def socket_write(self, socket_num, buffer, timeout=0):
         offset = ptr & SOCK_MASK
         if self._chip_type == "w5500":
             dst_addr = offset + (socket_num * SOCK_SIZE + 0x8000)
-    
+
             txbuf = buffer[:ret]
             cntl_byte = 0x14 + (socket_num << 5)
             self.write(dst_addr, cntl_byte, txbuf)
-            
-        else :
-        #if self._chip_type == "w5100s":
+
+        else:
+            # if self._chip_type == "w5100s":
             dst_addr = offset + (socket_num * SOCK_SIZE + 0x4000)
-    
-            if (offset + ret > SOCK_SIZE) :
+
+            if offset + ret > SOCK_SIZE:
                 size = SOCK_SIZE - offset
                 txbuf = buffer[0:size]
                 self.write(dst_addr, 0x00, txbuf)
                 txbuf = buffer[size:ret]
                 size = ret - size
-                dst_addr = (socket_num * SOCK_SIZE + 0x4000)
+                dst_addr = socket_num * SOCK_SIZE + 0x4000
                 self.write(dst_addr, 0x00, txbuf)
-            else :
+            else:
                 txbuf = buffer[:ret]
                 self.write(dst_addr, 0x00, buffer[:ret])
 
@@ -945,17 +949,19 @@ def _write_socket(self, sock, address, data):
         if self._chip_type == "w5500":
             cntl_byte = (sock << 5) + 0x0C
             return self.write(address, cntl_byte, data)
-        else :
-        #if self._chip_type == "w5100s":
+        if self._chip_type == "w5100s":
             cntl_byte = 0
-            return self.write(self._ch_base_msb + sock * CH_SIZE + address, cntl_byte, data)
+            return self.write(
+                self._ch_base_msb + sock * CH_SIZE + address, cntl_byte, data
+            )
+        return None
 
     def _read_socket(self, sock, address):
         """Read a W5k socket register."""
         if self._chip_type == "w5500":
             cntl_byte = (sock << 5) + 0x08
             return self.read(address, cntl_byte)
-        else :
-        #if self._chip_type == "w5100s":
+        if self._chip_type == "w5100s":
             cntl_byte = 0
             return self.read(self._ch_base_msb + sock * CH_SIZE + address, cntl_byte)
+        return None

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

@@ -192,8 +192,8 @@ def send_dhcp_message(self, state, time_elapsed, renew=False):
         # HW Type - ETH
         _BUFF[245] = 0x01
         # Client MAC Address
-        for mac in range(0, len(self._mac_address)):
-            _BUFF[246 + mac] = self._mac_address[mac]
+        for mac, val in enumerate(self._mac_address):
+            _BUFF[246 + mac] = val
 
         # Option - Host Name
         _BUFF[252] = 12
@@ -471,23 +471,24 @@ def _dhcp_state_machine(self):
                     print("* DHCP: Time to renew lease")
 
         if (
-            self._dhcp_state == STATE_DHCP_DISCOVER
-            or self._dhcp_state == STATE_DHCP_REQUEST
-        ) and time.monotonic() > (self._start_time + self._response_timeout):
+            self._dhcp_state
+            in (
+                STATE_DHCP_DISCOVER,
+                STATE_DHCP_REQUEST,
+            )
+            and time.monotonic() > (self._start_time + self._response_timeout)
+        ):
             self._dhcp_state = STATE_DHCP_WAIT
             if self._sock is not None:
                 self._sock.close()
                 self._sock = None
 
     def request_dhcp_lease(self):
         """Request to renew or acquire a DHCP lease."""
-        if self._dhcp_state == STATE_DHCP_LEASED or self._dhcp_state == STATE_DHCP_WAIT:
+        if self._dhcp_state in (STATE_DHCP_LEASED, STATE_DHCP_WAIT):
             self._dhcp_state = STATE_DHCP_START
 
-        while (
-            self._dhcp_state != STATE_DHCP_LEASED
-            and self._dhcp_state != STATE_DHCP_WAIT
-        ):
+        while self._dhcp_state not in (STATE_DHCP_LEASED, STATE_DHCP_WAIT):
             self._dhcp_state_machine()
 
         return self._dhcp_state == STATE_DHCP_LEASED

adafruit_wiznet5k/adafruit_wiznet5k_ntp.py

@@ -15,20 +15,25 @@
 **Hardware:**
 **Software and Dependencies:**
 
- 
+
 """
 import time
-
 import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
-from adafruit_wiznet5k.adafruit_wiznet5k_socket import htons
-
 
 ##__version__ = "0.0.0-auto.0"
 ##__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_NTP.git"
 
 
 class NTP:
-    def __init__(self, iface, ntp_address,utc,debug=False):
+    """
+    Wiznet5k NTP Client
+    :param iface: Wiznet 5k object
+    :param str ntp_address: The hostname of the NTP server
+    :param int utc: Numbers of hours to offset time from UTC
+    :param bool debug: Enable debugging output.
+    """
+
+    def __init__(self, iface, ntp_address, utc, debug=False):
         self._debug = debug
         self._iface = iface
         socket.set_interface(self._iface)
@@ -39,24 +44,21 @@ def __init__(self, iface, ntp_address,utc,debug=False):
         self._ntp_server = ntp_address
         self._host = 0
         self._request_id = 0  # request identifier
-        
-        self._pkt_buf_ = bytearray()
-
-    def _build_ntp_header(self,ip):
-        self._pkt_buf_.append(0x23)
 
-        for i in range(55):
-            self._pkt_buf_.append(0x00)
+        self._pkt_buf_ = bytearray([0x23] + [0x00] * 55)
 
     def get_time(self):
-        self._build_ntp_header(self._ntp_server)     
-        self._sock.bind((None,50001))
-        self._sock.sendto(self._pkt_buf_,(self._ntp_server, 123))
+        """
+        Get the time from the NTP server
+        :return: time in seconds since the epoch
+        """
+        self._sock.bind((None, 50001))
+        self._sock.sendto(self._pkt_buf_, (self._ntp_server, 123))
         while True:
             data = self._sock.recv()
-            if data: 
+            if data:
                 sec = data[40:44]
-                int_cal = int.from_bytes(sec,"big")
-                cal =int_cal - 2208988800 + self._utc *3600
-                cal = time.localtime(cal) 
+                int_cal = int.from_bytes(sec, "big")
+                cal = int_cal - 2208988800 + self._utc * 3600
+                cal = time.localtime(cal)
                 return cal

adafruit_wiznet5k/adafruit_wiznet5k_wsgiserver.py

@@ -44,9 +44,6 @@ def set_interface(iface):
     socket.set_interface(iface)
 
 
-# # Maximum number of sockets for the web server (number of connections we can hold)
-# MAX_SOCK_NUM = const(6)
-
 # pylint: disable=invalid-name
 class WSGIServer:
     """
@@ -62,12 +59,12 @@ def __init__(self, port=80, debug=False, application=None):
 
         self._response_status = None
         self._response_headers = []
-        if _the_interface.chip == "w5100s" :
+        if _the_interface.chip == "w5100s":
             self.MAX_SOCK_NUM = const(2)
-            print("MAX_SOCK_NUM is 2")
         else:
             self.MAX_SOCK_NUM = const(6)
-            print("MAX_SOCK_NUM is 6")
+        if self._debug:
+            print("Max sockets: ", self.MAX_SOCK_NUM)
 
     def start(self):
         """