From 1ea1487b1fc1c23b989e334f15b3c65fc837c28c Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 17 Dec 2021 16:41:14 -0800
Subject: [PATCH] Update pylint and re-lint

---
 .pre-commit-config.yaml  |  2 +-
 displayio/_display.py    | 12 ++++--------
 displayio/_displaybus.py |  6 +-----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7e02117..68b37c8 100644
--- 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
-    rev: pylint-2.7.1
+    rev: v2.11.1
     hooks:
     -   id: pylint
         name: pylint (library code)
diff --git a/displayio/_display.py b/displayio/_display.py
index 5ed157b..eacb654 100644
--- a/displayio/_display.py
+++ b/displayio/_display.py
@@ -298,14 +298,10 @@ class Display:
         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
 
diff --git a/displayio/_displaybus.py b/displayio/_displaybus.py
index 60b9d37..976e203 100644
--- 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"
 
-_DisplayBus = Union[
-    FourWire, 
-    I2CDisplay, 
-    paralleldisplay.ParallelBus
-]
\ No newline at end of file
+_DisplayBus = Union[FourWire, I2CDisplay, paralleldisplay.ParallelBus]
-- 
2.49.0