Merge pull request #21 from makermelissa/master

Bug fixes

diff --git a/displayio/fourwire.py b/displayio/fourwire.py
index a48c771380050141de7205aed61be293259b2d59..4aeee86cdcc5845b9fe1445e87987616e9a64ba0 100644 (file)
--- a/displayio/fourwire.py
+++ b/displayio/fourwire.py
@@ -120,13 +120,12 @@ class FourWire:
     def begin_transaction(self):
         """Begin the SPI transaction by locking, configuring, and setting Chip Select
         """
-        if not self._spi.try_lock():
-            return False
+        while not self._spi.try_lock():
+            pass
         self._spi.configure(
             baudrate=self._frequency, polarity=self._polarity, phase=self._phase
         )
         self._chip_select.value = False
-        return True
 
     def end_transaction(self):
         """End the SPI transaction by unlocking and setting Chip Select

diff --git a/fontio.py b/fontio.py
index cbb57d62246f45ad1a27b3748c6d1a7c743af39a..5e02bdb417a7df274f8dd8e2a64294bdcb88c5d7 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -99,11 +99,11 @@ class BuiltinFont:
         return self._bitmap
 
 
-# pylint: disable=too-few-public-methods, invalid-name
+# pylint: disable=too-few-public-methods, invalid-name, too-many-arguments
 class Glyph:
     """Storage of glyph info"""
 
-    def __init__(self, *, bitmap, tile_index, width, height, dx, dy, shift_x, shift_y):
+    def __init__(self, bitmap, tile_index, width, height, dx, dy, shift_x, shift_y):
         self.bitmap = bitmap
         self.width = width
         self.height = height
@@ -114,4 +114,4 @@ class Glyph:
         self.tile_index = tile_index
 
 
-# pylint: enable=too-few-public-methods, invalid-name
+# pylint: enable=too-few-public-methods, invalid-name, too-many-arguments