Merge pull request #46 from adafruit/patch-fix

Linted

Author: kattni

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

examples/wiznet5k_wsgiserver_test.py

@@ -20,36 +20,35 @@
 import busio
 import digitalio
 import neopixel
-import time
 
 import adafruit_requests as requests
+from adafruit_wsgi.wsgi_app import WSGIApp
 from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
 import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
 import adafruit_wiznet5k.adafruit_wiznet5k_wsgiserver as server
-from adafruit_wsgi.wsgi_app import WSGIApp
 
 
 print("Wiznet5k Web Server Test")
 
 
-def get_mac(i2c):
+def get_mac(i2c_obj):
     "Read MAC from 24AA02E48 chip and return it"
-    mac = bytearray(6)
-    while not i2c.try_lock():
+    mac_addr = bytearray(6)
+    while not i2c_obj.try_lock():
         pass
-    i2c.writeto(0x50, bytearray((0xFA,)))
-    i2c.readfrom_into(0x50, mac, start=0, end=6)
-    i2c.unlock()
-    return mac
+    i2c_obj.writeto(0x50, bytearray((0xFA,)))
+    i2c_obj.readfrom_into(0x50, mac_addr, start=0, end=6)
+    i2c_obj.unlock()
+    return mac_addr
 
 
 def get_static_file(filename):
     "Static file generator"
     with open(filename, "rb") as f:
-        bytes = None
-        while bytes is None or len(bytes) == 2048:
-            bytes = f.read(2048)
-            yield bytes
+        b = None
+        while b is None or len(b) == 2048:
+            b = f.read(2048)
+            yield b
 
 
 # Status LED
@@ -107,13 +106,13 @@ def large(request):  # pylint: disable=unused-argument
 
 
 @web_app.route("/code")
-def large(request):  # pylint: disable=unused-argument
+def code(request):  # pylint: disable=unused-argument
     print("Static file code.py handler")
     return ("200 OK", [], get_static_file("code.py"))
 
 
 @web_app.route("/btc")
-def btc(request):
+def btc(request):  # pylint: disable=unused-argument
     print("BTC handler")
     r = requests.get("http://api.coindesk.com/v1/bpi/currentprice/USD.json")
     result = r.text