From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 23 Jun 2020 21:06:52 +0000 (-0700)
Subject: Merge pull request #21 from makermelissa/master
X-Git-Tag: 0.3.1
X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/a3105537d2e9c087f9312b1122739772d2c37c32?hp=f6cecfd2b767c953b24c6b0959f7cd04a7fdc892

Merge pull request #21 from makermelissa/master

Bug fixes
---

diff --git a/displayio/fourwire.py b/displayio/fourwire.py
index a48c771..4aeee86 100644
--- 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 cbb57d6..5e02bdb 100644
--- 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