Linted stuff

diff --git a/displayio/__init__.py b/displayio/__init__.py
index cd7b76513a2c281880f578d5f2a4d65faf2285ff..d0707ac13cb8e96dad4c07eefcbc2f547d253cca 100644 (file)
--- a/displayio/__init__.py
+++ b/displayio/__init__.py
@@ -17,20 +17,9 @@ displayio for Blinka
 
 """
 
 
 """
 

-# Needed for _DisplayBus

 from typing import Union
 from typing import Union

-import paralleldisplay

 from ._fourwire import FourWire
 from ._i2cdisplay import I2CDisplay
 from ._fourwire import FourWire
 from ._i2cdisplay import I2CDisplay

-
-__version__ = "0.0.0-auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
-
-
-_DisplayBus = Union[FourWire, I2CDisplay, paralleldisplay.ParallelBus]
-
-# Import the remaining name spaces
-# pylint: disable=wrong-import-position

 from ._bitmap import Bitmap
 from ._colorspace import Colorspace
 from ._colorconverter import ColorConverter
 from ._bitmap import Bitmap
 from ._colorspace import Colorspace
 from ._colorconverter import ColorConverter


@@ -42,8 +31,10 @@ from ._palette import Palette
 from ._shape import Shape
 from ._tilegrid import TileGrid
 from ._display import displays
 from ._shape import Shape
 from ._tilegrid import TileGrid
 from ._display import displays

+from ._displaybus import _DisplayBus

 
 

-# pylint: enable=wrong-import-position
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"

 
 
 def release_displays() -> None:
 
 
 def release_displays() -> None:

diff --git a/displayio/_bitmap.py b/displayio/_bitmap.py
index 63125aaeb3acf5afd0f90d496e7b11fab9fa29fa..f28e72a15961201994042f92deaaf028b13f71eb 100644 (file)
--- a/displayio/_bitmap.py
+++ b/displayio/_bitmap.py
@@ -131,12 +131,12 @@ class Bitmap:
         y2: int,
         skip_index: int,
     ) -> None:
         y2: int,
         skip_index: int,
     ) -> None:

-        # pylint: disable=unnecessary-pass
+        # pylint: disable=unnecessary-pass, invalid-name

         """Inserts the source_bitmap region defined by rectangular boundaries"""
         pass
 
     def dirty(self, x1: int = 0, y1: int = 0, x2: int = -1, y2: int = -1) -> None:
         """Inserts the source_bitmap region defined by rectangular boundaries"""
         pass
 
     def dirty(self, x1: int = 0, y1: int = 0, x2: int = -1, y2: int = -1) -> None:

-        # pylint: disable=unnecessary-pass
+        # pylint: disable=unnecessary-pass, invalid-name

         """Inform displayio of bitmap updates done via the buffer protocol."""
         pass
 
         """Inform displayio of bitmap updates done via the buffer protocol."""
         pass
 

diff --git a/displayio/_colorconverter.py b/displayio/_colorconverter.py
index 513201956ac8397040741a6236bc8ea0ec39df4a..dc6fc164b48dc7f198449cc92ab8ec91d4dc637a 100644 (file)
--- a/displayio/_colorconverter.py
+++ b/displayio/_colorconverter.py
@@ -39,18 +39,21 @@ class ColorConverter:
         self._depth = 16
         self._transparent_color = None
         self._rgba = False
         self._depth = 16
         self._transparent_color = None
         self._rgba = False

+        self._input_colorspace = input_colorspace

 
     def _compute_rgb565(self, color: int):
         self._depth = 16
         return (color[0] & 0xF8) << 8 | (color[1] & 0xFC) << 3 | color[2] >> 3
 
 
     def _compute_rgb565(self, color: int):
         self._depth = 16
         return (color[0] & 0xF8) << 8 | (color[1] & 0xFC) << 3 | color[2] >> 3
 

-    def _compute_luma(self, color: int):
+    @staticmethod
+    def _compute_luma(color: int):

         red = color >> 16
         green = (color >> 8) & 0xFF
         blue = color & 0xFF
         return (red * 19) / 255 + (green * 182) / 255 + (blue + 54) / 255
 
         red = color >> 16
         green = (color >> 8) & 0xFF
         blue = color & 0xFF
         return (red * 19) / 255 + (green * 182) / 255 + (blue + 54) / 255
 

-    def _compute_chroma(self, color: int):
+    @staticmethod
+    def _compute_chroma(color: int):

         red = color >> 16
         green = (color >> 8) & 0xFF
         blue = color & 0xFF
         red = color >> 16
         green = (color >> 8) & 0xFF
         blue = color & 0xFF


@@ -76,7 +79,8 @@ class ColorConverter:
 
         return hue
 
 
         return hue
 

-    def _dither_noise_1(self, noise):
+    @staticmethod
+    def _dither_noise_1(noise):

         noise = (noise >> 13) ^ noise
         more_noise = (
             noise * (noise * noise * 60493 + 19990303) + 1376312589
         noise = (noise >> 13) ^ noise
         more_noise = (
             noise * (noise * noise * 60493 + 19990303) + 1376312589


@@ -114,6 +118,7 @@ class ColorConverter:
         self._transparent_color = color
 
     def make_opaque(self, color: int) -> None:
         self._transparent_color = color
 
     def make_opaque(self, color: int) -> None:

+        # pylint: disable=unused-argument

         """Make the ColorConverter be opaque and have no transparent pixels."""
         self._transparent_color = None
 
         """Make the ColorConverter be opaque and have no transparent pixels."""
         self._transparent_color = None
 

diff --git a/displayio/_display.py b/displayio/_display.py
index 4e5da3f9b62cac322ad5c5f07223e26fbc02e23a..5ed157b53bb8a3e9c42be46a38c99f9c4789480a 100644 (file)
--- a/displayio/_display.py
+++ b/displayio/_display.py
@@ -20,16 +20,16 @@ displayio for Blinka
 import time
 import struct
 import threading
 import time
 import struct
 import threading

+from typing import Optional

 import digitalio
 from PIL import Image
 import numpy
 import microcontroller
 from recordclass import recordclass
 import digitalio
 from PIL import Image
 import numpy
 import microcontroller
 from recordclass import recordclass

-from ._colorconverter import ColorConverter

 import _typing
 import _typing

+from ._displaybus import _DisplayBus
+from ._colorconverter import ColorConverter

 from ._group import Group
 from ._group import Group

-from displayio import _DisplayBus
-from typing import Optional

 from ._constants import (
     CHIP_SELECT_TOGGLE_EVERY_BYTE,
     CHIP_SELECT_UNTOUCHED,
 from ._constants import (
     CHIP_SELECT_TOGGLE_EVERY_BYTE,
     CHIP_SELECT_UNTOUCHED,


@@ -87,7 +87,7 @@ class Display:
         SH1107_addressing: bool = False,
         set_vertical_scroll: int = 0,
     ):
         SH1107_addressing: bool = False,
         set_vertical_scroll: int = 0,
     ):

-        # pylint: disable=unused-argument,too-many-locals
+        # pylint: disable=unused-argument,too-many-locals,invalid-name

         """Create a Display object on the given display bus (`displayio.FourWire` or
         `paralleldisplay.ParallelBus`).
 
         """Create a Display object on the given display bus (`displayio.FourWire` or
         `paralleldisplay.ParallelBus`).
 


@@ -179,7 +179,8 @@ class Display:
             i += 2 + data_size
 
     def _send(self, command, data):
             i += 2 + data_size
 
     def _send(self, command, data):

-        self._bus._begin_transaction()  # pylint: disable=protected-access
+        # pylint: disable=protected-access
+        self._bus._begin_transaction()

         if self._data_as_commands:
             self._bus._send(
                 DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, bytes([command] + data)
         if self._data_as_commands:
             self._bus._send(
                 DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, bytes([command] + data)


@@ -189,9 +190,10 @@ class Display:
                 DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, bytes([command])
             )
             self._bus._send(DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, data)
                 DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, bytes([command])
             )
             self._bus._send(DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, data)

-        self._bus._end_transaction()  # pylint: disable=protected-access
+        self._bus._end_transaction()

 
     def _send_pixels(self, data):
 
     def _send_pixels(self, data):

+        # pylint: disable=protected-access

         if not self._data_as_commands:
             self._bus._send(
                 DISPLAY_COMMAND,
         if not self._data_as_commands:
             self._bus._send(
                 DISPLAY_COMMAND,


@@ -334,7 +336,7 @@ class Display:
 
     def _encode_pos(self, x, y):
         """Encode a postion into bytes."""
 
     def _encode_pos(self, x, y):
         """Encode a postion into bytes."""

-        return struct.pack(self._bounds_encoding, x, y)
+        return struct.pack(self._bounds_encoding, x, y)  # pylint: disable=no-member

 
     def fill_row(
         self, y: int, buffer: _typing.WriteableBuffer
 
     def fill_row(
         self, y: int, buffer: _typing.WriteableBuffer

diff --git a/displayio/_displaybus.py b/displayio/_displaybus.py
new file mode 100644 (file)
index 0000000..60b9d37
--- /dev/null
+++ b/displayio/_displaybus.py
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams
+#
+# SPDX-License-Identifier: MIT
+
+"""
+`displayio._displaybus`
+================================================================================
+
+Type aliases for Blinka
+
+**Software and Dependencies:**
+
+* Adafruit Blinka:
+  https://github.com/adafruit/Adafruit_Blinka/releases
+
+* Author(s): Melissa LeBlanc-Williams
+
+"""
+
+from typing import Union
+import paralleldisplay
+from ._fourwire import FourWire
+from ._i2cdisplay import I2CDisplay
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git"
+
+_DisplayBus = Union[
+    FourWire, 
+    I2CDisplay, 
+    paralleldisplay.ParallelBus
+]
\ No newline at end of file

diff --git a/displayio/_epaperdisplay.py b/displayio/_epaperdisplay.py
index 56181d66168a53f1023aa744dc7f76beb5a891a9..2751c942edc3ec81c0ce58567e07177d6dfb2e86 100644 (file)
--- a/displayio/_epaperdisplay.py
+++ b/displayio/_epaperdisplay.py
@@ -17,11 +17,11 @@ displayio for Blinka
 
 """
 
 
 """
 

+from typing import Optional

 import microcontroller
 import _typing
 from ._group import Group
 import microcontroller
 import _typing
 from ._group import Group

-from . import _DisplayBus
-from typing import Optional
+from ._displaybus import _DisplayBus

 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"


@@ -69,7 +69,7 @@ class EPaperDisplay:
         always_toggle_chip_select: bool = False,
         grayscale: bool = False,
     ):
         always_toggle_chip_select: bool = False,
         grayscale: bool = False,
     ):

-        # pylint: disable=too-many-locals
+        # pylint: disable=too-many-locals, unused-argument

         """
         Create a EPaperDisplay object on the given display bus (displayio.FourWire or
         paralleldisplay.ParallelBus).
         """
         Create a EPaperDisplay object on the given display bus (displayio.FourWire or
         paralleldisplay.ParallelBus).

diff --git a/displayio/_group.py b/displayio/_group.py
index 8e006b23b589b688b163a736b429c381873ca3fc..abfe80795a5370460fbdecb4fe26256e16f26c14 100644 (file)
--- a/displayio/_group.py
+++ b/displayio/_group.py
@@ -79,17 +79,16 @@ class Group:
         if self.in_group:
             for layer in self._layers:
                 layer._update_transform(self._absolute_transform)
         if self.in_group:
             for layer in self._layers:
                 layer._update_transform(self._absolute_transform)

-        # pylint: enable=protected-access

 
     def _removal_cleanup(self, index):
 
     def _removal_cleanup(self, index):

+        # pylint: disable=protected-access

         layer = self._layers[index]
         layer = self._layers[index]

-        layer._update_transform(None)  # pylint: disable=protected-access
+        layer._update_transform(None)

 
     def _layer_update(self, index):
         # pylint: disable=protected-access
         layer = self._layers[index]
         layer._update_transform(self._absolute_transform)
 
     def _layer_update(self, index):
         # pylint: disable=protected-access
         layer = self._layers[index]
         layer._update_transform(self._absolute_transform)

-        # pylint: enable=protected-access

 
     def append(self, layer: Union[Group, TileGrid]) -> None:
         """Append a layer to the group. It will be drawn
 
     def append(self, layer: Union[Group, TileGrid]) -> None:
         """Append a layer to the group. It will be drawn

diff --git a/displayio/_i2cdisplay.py b/displayio/_i2cdisplay.py
index 63e4af6fa82e327f5d75ddb421d402ece1cd15f8..421fd105c7d3024df692cd688b6d4deddc05e886 100644 (file)
--- a/displayio/_i2cdisplay.py
+++ b/displayio/_i2cdisplay.py
@@ -86,8 +86,8 @@ class I2CDisplay:
         self._send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, bytes([command] + data))
         self._end_transaction()
 
         self._send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, bytes([command] + data))
         self._end_transaction()
 

-    # pylint: disable=unused-argument

     def _send(self, data_type: int, chip_select: int, data: _typing.ReadableBuffer):
     def _send(self, data_type: int, chip_select: int, data: _typing.ReadableBuffer):

+        # pylint: disable=unused-argument

         if data_type == DISPLAY_COMMAND:
             n = len(data)
             if n > 0:
         if data_type == DISPLAY_COMMAND:
             n = len(data)
             if n > 0:


@@ -103,8 +103,6 @@ class I2CDisplay:
             data_bytes[1:] = data
             self._i2c.writeto(self._dev_addr, buffer=data_bytes, stop=True)
 
             data_bytes[1:] = data
             self._i2c.writeto(self._dev_addr, buffer=data_bytes, stop=True)
 

-    # pylint: enable=unused-argument
-

     def _end_transaction(self) -> None:
         """Release the bus after sending data."""
         self._i2c.unlock()
     def _end_transaction(self) -> None:
         """Release the bus after sending data."""
         self._i2c.unlock()

diff --git a/paralleldisplay.py b/paralleldisplay.py
index f2aae8ddb29b00191f839e1a140e55ff135d4750..b666121126aa977e57ae0e35b0c188077c48c668 100644 (file)
--- a/paralleldisplay.py
+++ b/paralleldisplay.py
@@ -17,8 +17,8 @@ paralleldisplay for Blinka
 
 """
 
 
 """
 

-import _typing

 import microcontroller
 import microcontroller

+import _typing

 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"