Update MyPy to 2.1.0, with necessary fixes

pyproject.toml

@@ -72,7 +72,7 @@ mss = "mss.__main__:main"
 dev = [
   "build==1.5.0",
   "lxml==6.1.1",
-  "mypy==1.20.2",
+  "mypy==2.1.0",
   "ruff==0.15.18",
   "twine==6.2.0",
   "typing_extensions==4.15.0",

src/mss/linux/xlib.py

@@ -40,6 +40,8 @@
 from mss.screenshot import ScreenShot
 
 if TYPE_CHECKING:
+    from threading import Thread
+
     from mss.models import CFunctions, Monitor, Monitors
 
 __all__ = ()
@@ -259,7 +261,7 @@ class XWindowAttributes(Structure):
     )
 
 
-_ERROR = {}
+_ERROR: dict[Thread, dict[str, Any]] = {}
 _X11 = find_library("X11")
 _XFIXES = find_library("Xfixes")
 _XRANDR = find_library("Xrandr")

src/mss/tools.py

@@ -142,7 +142,9 @@ def parse_edid(edid_data: bytes) -> dict:
     return rv
 
 
-def to_png(data: bytes, size: tuple[int, int], /, *, level: int = 6, output: Path | str | None = None) -> bytes | None:
+def to_png(
+    data: bytes | memoryview[int], size: tuple[int, int], /, *, level: int = 6, output: Path | str | None = None
+) -> bytes | None:
     """Dump data to a PNG file.  If `output` is `None`, create no file but return
     the whole PNG data.
 

src/tests/bench_bgra2rgb.py

@@ -37,7 +37,7 @@
 from mss.screenshot import ScreenShot
 
 
-def mss_rgb(im: ScreenShot) -> bytes:
+def mss_rgb(im: ScreenShot) -> memoryview:
     return im.rgb
 
 

src/tests/bench_general.py

@@ -45,7 +45,7 @@ def grab(sct: MSS) -> ScreenShot:
     return sct.grab(monitor)
 
 
-def access_rgb(sct: MSS) -> bytes:
+def access_rgb(sct: MSS) -> memoryview:
     im = grab(sct)
     return im.rgb