From: Melissa LeBlanc-Williams Date: Sat, 18 Dec 2021 19:03:36 +0000 (-0800) Subject: Fix stuff from review X-Git-Tag: 0.8.0^2 X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/0e97a82b0936a6a578e05ab4f6258cfd4ade23fc?ds=sidebyside Fix stuff from review --- diff --git a/_typing.py b/_typing.py index fb3bac0..85cb393 100644 --- a/_typing.py +++ b/_typing.py @@ -17,13 +17,12 @@ Type aliases for Blinka """ +from typing import Union __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" -from typing import Union - WriteableBuffer = Union[ bytearray, memoryview, diff --git a/displayio/_epaperdisplay.py b/displayio/_epaperdisplay.py index 2751c94..29f8a54 100644 --- a/displayio/_epaperdisplay.py +++ b/displayio/_epaperdisplay.py @@ -62,10 +62,10 @@ class EPaperDisplay: color_bits_inverted: bool = False, highlight_color: int = 0x000000, refresh_display_command: int, - refresh_time: float = 40, + refresh_time: float = 40.0, busy_pin: Optional[microcontroller.Pin] = None, busy_state: bool = True, - seconds_per_frame: float = 180, + seconds_per_frame: float = 180.0, always_toggle_chip_select: bool = False, grayscale: bool = False, ): diff --git a/displayio/_group.py b/displayio/_group.py index abfe807..6be7c6f 100644 --- a/displayio/_group.py +++ b/displayio/_group.py @@ -111,32 +111,36 @@ class Group: """ return self._layers.index(layer) - def pop(self, index=-1) -> Union[Group, TileGrid]: + def pop(self, index: int = -1) -> Union[Group, TileGrid]: """Remove the ith item and return it.""" self._removal_cleanup(index) return self._layers.pop(index) - def remove(self, layer) -> None: + def remove(self, layer: Union[Group, TileGrid]) -> None: """Remove the first copy of layer. Raises ValueError if it is not present.""" index = self.index(layer) self._layers.pop(index) + def __bool__(self) -> bool: + """Returns if there are any layers""" + return len(self._layers) > 0 + def __len__(self) -> int: """Returns the number of layers in a Group""" return len(self._layers) - def __getitem__(self, index) -> Union[Group, TileGrid]: + def __getitem__(self, index: int) -> Union[Group, TileGrid]: """Returns the value at the given index.""" return self._layers[index] - def __setitem__(self, index, value) -> None: + def __setitem__(self, index: int, value: Union[Group, TileGrid]) -> None: """Sets the value at the given index.""" self._removal_cleanup(index) self._layers[index] = value self._layer_update(index) - def __delitem__(self, index) -> None: + def __delitem__(self, index: int) -> None: """Deletes the value at the given index.""" del self._layers[index] @@ -154,8 +158,8 @@ class Group: @property def hidden(self) -> bool: - """True when the Group and all of it’s layers are not visible. When False, the - Group’s layers are visible if they haven’t been hidden. + """True when the Group and all of it's layers are not visible. When False, the + Group’s layers are visible if they haven't been hidden. """ return self._hidden_group