Merge remote-tracking branch 'upstream/patch-fix' into feature/add-typehints

Author: tekktrik

adafruit_featherwing/alphanum_featherwing.py

@@ -15,7 +15,7 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git"
 
 import board
-import adafruit_ht16k33.segments as segments
+from adafruit_ht16k33 import segments
 from adafruit_featherwing.led_segments import Segments
 
 try:

adafruit_featherwing/gps_featherwing.py

@@ -41,8 +41,7 @@ def __init__(self, update_period: int = 1000, baudrate: int = 9600):
         if update_period < 250:
             raise ValueError("Update Frequency be at least 250 milliseconds")
         timeout = update_period // 1000 + 2
-        if timeout < 3:
-            timeout = 3
+        timeout = max(timeout, 3)
 
         self._uart = busio.UART(board.TX, board.RX, baudrate=baudrate, timeout=timeout)
         self._gps = adafruit_gps.GPS(self._uart, debug=False)

adafruit_featherwing/matrix_featherwing.py

@@ -16,7 +16,7 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git"
 
 import board
-import adafruit_ht16k33.matrix as matrix
+from adafruit_ht16k33 import matrix
 
 from adafruit_featherwing.auto_writeable import AutoWriteable
 

adafruit_featherwing/sevensegment_featherwing.py

@@ -15,7 +15,7 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git"
 
 import board
-import adafruit_ht16k33.segments as segments
+from adafruit_ht16k33 import segments
 from adafruit_featherwing.led_segments import Segments
 
 try:

examples/featherwing_keyboard_featherwing.py

@@ -20,17 +20,12 @@
 kbd_featherwing.neopixel[0] = 0x002244
 
 try:
-    f = open(  # pylint: disable=unspecified-encoding,consider-using-with
-        "/sd/tft_featherwing.txt", "w"
-    )
-    f.write("Blinka\nBlackberry Q10 Keyboard")
-    f.close()
-
-    f = open(  # pylint: disable=unspecified-encoding,consider-using-with
-        "/sd/tft_featherwing.txt", "r"
-    )
-    print(f.read())
-    f.close()
+    with open("/sd/tft_featherwing.txt", "w") as f:
+        f.write("Blinka\nBlackberry Q10 Keyboard")
+
+    with open("/sd/tft_featherwing.txt", "r") as f:
+        print(f.read())
+
 except OSError as error:
     print("Unable to write to SD Card.")
 

examples/featherwing_tft24_simpletest.py

@@ -13,14 +13,10 @@
 tft_featherwing = tft_featherwing_24.TFTFeatherWing24()
 
 try:
-    with open(  # pylint: disable=unspecified-encoding
-        "/sd/tft_featherwing.txt", "w"
-    ) as f:
+    with open("/sd/tft_featherwing.txt", "w") as f:
         f.write("Blinka\nBlackberry Q10 Keyboard")
 
-    with open(  # pylint: disable=unspecified-encoding
-        "/sd/tft_featherwing.txt", "r"
-    ) as f:
+    with open("/sd/tft_featherwing.txt", "r") as f:
         print(f.read())
 
 except OSError as error:

examples/featherwing_tft35_simpletest.py

@@ -13,17 +13,15 @@
 tft_featherwing = tft_featherwing_35.TFTFeatherWing35()
 
 try:
-    f = open(  # pylint: disable=unspecified-encoding,consider-using-with
+    with open(  # pylint: disable=unspecified-encoding
         "/sd/tft_featherwing.txt", "w"
-    )
-    f.write("Blinka\nBlackberry Q10 Keyboard")
-    f.close()
+    ) as f:
+        f.write("Blinka\nBlackberry Q10 Keyboard")
 
-    f = open(  # pylint: disable=unspecified-encoding,consider-using-with
+    with open(  # pylint: disable=unspecified-encoding
         "/sd/tft_featherwing.txt", "r"
-    )
-    print(f.read())
-    f.close()
+    ) as f:
+        print(f.read())
 except OSError as error:
     print("Unable to write to SD Card.")