Refactor Qt typing

Author: hugovk

Tests/test_qt_image_qapplication.py

@@ -1,8 +1,5 @@
 from __future__ import annotations
 
-from pathlib import Path
-from typing import Union
-
 import pytest
 
 from PIL import Image, ImageQt
@@ -11,18 +8,8 @@
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    import PyQt6
-    import PySide6
-
-    QApplication = Union[PyQt6.QtWidgets.QApplication, PySide6.QtWidgets.QApplication]
-    QHBoxLayout = Union[PyQt6.QtWidgets.QHBoxLayout, PySide6.QtWidgets.QHBoxLayout]
-    QImage = Union[PyQt6.QtGui.QImage, PySide6.QtGui.QImage]
-    QLabel = Union[PyQt6.QtWidgets.QLabel, PySide6.QtWidgets.QLabel]
-    QPainter = Union[PyQt6.QtGui.QPainter, PySide6.QtGui.QPainter]
-    QPixmap = Union[PyQt6.QtGui.QPixmap, PySide6.QtGui.QPixmap]
-    QPoint = Union[PyQt6.QtCore.QPoint, PySide6.QtCore.QPoint]
-    QRegion = Union[PyQt6.QtGui.QRegion, PySide6.QtGui.QRegion]
-    QWidget = Union[PyQt6.QtWidgets.QWidget, PySide6.QtWidgets.QWidget]
+    from pathlib import Path
+
 
 if ImageQt.qt_is_installed:
     from PIL.ImageQt import QPixmap
@@ -32,11 +19,16 @@
         from PyQt6.QtGui import QImage, QPainter, QRegion
         from PyQt6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
     elif ImageQt.qt_version == "side6":
-        from PySide6.QtCore import QPoint
-        from PySide6.QtGui import QImage, QPainter, QRegion
-        from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
-
-    class Example(QWidget):  # type: ignore[misc]
+        from PySide6.QtCore import QPoint  # type: ignore[assignment]
+        from PySide6.QtGui import QImage, QPainter, QRegion  # type: ignore[assignment]
+        from PySide6.QtWidgets import (  # type: ignore[assignment]
+            QApplication,
+            QHBoxLayout,
+            QLabel,
+            QWidget,
+        )
+
+    class Example(QWidget):
         def __init__(self) -> None:
             super().__init__()
 
@@ -47,9 +39,9 @@ def __init__(self) -> None:
             pixmap1 = getattr(ImageQt.QPixmap, "fromImage")(qimage)
 
             # hbox
-            QHBoxLayout(self)  # type: ignore[operator]
+            QHBoxLayout(self)
 
-            lbl = QLabel(self)  # type: ignore[operator]
+            lbl = QLabel(self)
             # Segfault in the problem
             lbl.setPixmap(pixmap1.copy())
 
@@ -63,7 +55,7 @@ def roundtrip(expected: Image.Image) -> None:
 @pytest.mark.skipif(not ImageQt.qt_is_installed, reason="Qt bindings are not installed")
 def test_sanity(tmp_path: Path) -> None:
     # Segfault test
-    app: QApplication | None = QApplication([])  # type: ignore[operator]
+    app: QApplication | None = QApplication([])
     ex = Example()
     assert app  # Silence warning
     assert ex  # Silence warning
@@ -84,11 +76,11 @@ def test_sanity(tmp_path: Path) -> None:
         imageqt = ImageQt.ImageQt(im)
         data = getattr(QPixmap, "fromImage")(imageqt)
         qt_format = getattr(QImage, "Format") if ImageQt.qt_version == "6" else QImage
-        qimage = QImage(128, 128, getattr(qt_format, "Format_ARGB32"))  # type: ignore[operator]
-        painter = QPainter(qimage)  # type: ignore[operator]
-        image_label = QLabel()  # type: ignore[operator]
+        qimage = QImage(128, 128, getattr(qt_format, "Format_ARGB32"))
+        painter = QPainter(qimage)
+        image_label = QLabel()
         image_label.setPixmap(data)
-        image_label.render(painter, QPoint(0, 0), QRegion(0, 0, 128, 128))  # type: ignore[operator]
+        image_label.render(painter, QPoint(0, 0), QRegion(0, 0, 128, 128))
         painter.end()
         rendered_tempfile = str(tmp_path / f"temp_rendered_{mode}.png")
         qimage.save(rendered_tempfile)

Tests/test_qt_image_toqimage.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 
-from pathlib import Path
-
 import pytest
 
 from PIL import ImageQt
 
 from .helper import assert_image_equal, assert_image_equal_tofile, hopper
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from pathlib import Path
+
 pytestmark = pytest.mark.skipif(
     not ImageQt.qt_is_installed, reason="Qt bindings are not installed"
 )
@@ -21,7 +23,7 @@ def test_sanity(mode: str, tmp_path: Path) -> None:
     src = hopper(mode)
     data = ImageQt.toqimage(src)
 
-    assert isinstance(data, QImage)  # type: ignore[arg-type, misc]
+    assert isinstance(data, QImage)
     assert not data.isNull()
 
     # reload directly from the qimage

src/PIL/ImageQt.py

@@ -18,25 +18,19 @@
 from __future__ import annotations
 
 import sys
-from collections.abc import Callable
 from io import BytesIO
-from typing import Any, Union
 
 from . import Image
 from ._util import is_path
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    import PyQt6
-    import PySide6
+    from collections.abc import Callable
+    from typing import Any
 
     from . import ImageFile
 
     QBuffer: type
-    QByteArray = Union[PyQt6.QtCore.QByteArray, PySide6.QtCore.QByteArray]
-    QIODevice = Union[PyQt6.QtCore.QIODevice, PySide6.QtCore.QIODevice]
-    QImage = Union[PyQt6.QtGui.QImage, PySide6.QtGui.QImage]
-    QPixmap = Union[PyQt6.QtGui.QPixmap, PySide6.QtGui.QPixmap]
 
 qt_version: str | None
 qt_versions = [
@@ -50,11 +44,15 @@
     try:
         qRgba: Callable[[int, int, int, int], int]
         if qt_module == "PyQt6":
-            from PyQt6.QtCore import QBuffer, QIODevice
+            from PyQt6.QtCore import QBuffer, QByteArray, QIODevice
             from PyQt6.QtGui import QImage, QPixmap, qRgba
         elif qt_module == "PySide6":
-            from PySide6.QtCore import QBuffer, QIODevice
-            from PySide6.QtGui import QImage, QPixmap, qRgba
+            from PySide6.QtCore import (  # type: ignore[assignment]
+                QBuffer,
+                QByteArray,
+                QIODevice,
+            )
+            from PySide6.QtGui import QImage, QPixmap, qRgba  # type: ignore[assignment]
     except (ImportError, RuntimeError):
         continue
     qt_is_installed = True
@@ -184,7 +182,7 @@ def _toqclass_helper(im: Image.Image | str | QByteArray) -> dict[str, Any]:
 
 if qt_is_installed:
 
-    class ImageQt(QImage):  # type: ignore[misc]
+    class ImageQt(QImage):
         def __init__(self, im: Image.Image | str | QByteArray) -> None:
             """
             An PIL image wrapper for Qt.  This is a subclass of PyQt's QImage