Update pylint and re-lint

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7e0211762b9e1e096e5d02f92884b499aaacbfa6..68b37c856c946521c83c52955856351782c749bc 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/pycqa/pylint
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/pycqa/pylint

-    rev: pylint-2.7.1
+    rev: v2.11.1

     hooks:
     -   id: pylint
         name: pylint (library code)
     hooks:
     -   id: pylint
         name: pylint (library code)

diff --git a/displayio/_display.py b/displayio/_display.py
index 5ed157b53bb8a3e9c42be46a38c99f9c4789480a..eacb6544775f45a8195236788a3e2e3f71216f00 100644 (file)
--- a/displayio/_display.py
+++ b/displayio/_display.py
@@ -298,14 +298,10 @@ class Display:
         else:
             width, height = self._width, self._height
 
         else:
             width, height = self._width, self._height
 

-        if rectangle.x1 < 0:
-            rectangle.x1 = 0
-        if rectangle.y1 < 0:
-            rectangle.y1 = 0
-        if rectangle.x2 > width:
-            rectangle.x2 = width
-        if rectangle.y2 > height:
-            rectangle.y2 = height
+        rectangle.x1 = max(rectangle.x1, 0)
+        rectangle.y1 = max(rectangle.y1, 0)
+        rectangle.x2 = min(rectangle.x2, width)
+        rectangle.y2 = min(rectangle.y2, height)

 
         return rectangle
 
 
         return rectangle
 

diff --git a/displayio/_displaybus.py b/displayio/_displaybus.py
index 60b9d3744288cd33f32e59acb30872ea63876de4..976e2036812ac468dced39d3bb9d7f53be66e40c 100644 (file)
--- a/displayio/_displaybus.py
+++ b/displayio/_displaybus.py
@@ -25,8 +25,4 @@ from ._i2cdisplay import I2CDisplay
 __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"
 

-_DisplayBus = Union[
-    FourWire, 
-    I2CDisplay, 
-    paralleldisplay.ParallelBus
-]
\ No newline at end of file
+_DisplayBus = Union[FourWire, I2CDisplay, paralleldisplay.ParallelBus]