Merge pull request #5258 from radarhere/pyqt6

python-pillow · Feb 11, 2021 · 5d67f79 · 5d67f79
2 parents cc4ed21 + 98eaef5
commit 5d67f79
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py
@@ -14,7 +14,9 @@ def test_rgb():
     # typedef QRgb
     # An ARGB quadruplet on the format #AARRGGBB,
     # equivalent to an unsigned int.
-    if ImageQt.qt_version == "side6":
+    if ImageQt.qt_version == "6":
+        from PyQt6.QtGui import qRgb
+    elif ImageQt.qt_version == "side6":
         from PySide6.QtGui import qRgb
     elif ImageQt.qt_version == "5":
         from PyQt5.QtGui import qRgb

diff --git a/Tests/test_qt_image_qapplication.py b/Tests/test_qt_image_qapplication.py
@@ -7,7 +7,9 @@
 if ImageQt.qt_is_installed:
     from PIL.ImageQt import QPixmap
 
-    if ImageQt.qt_version == "side6":
+    if ImageQt.qt_version == "6":
+        from PyQt6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
+    elif ImageQt.qt_version == "side6":
         from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
     elif ImageQt.qt_version == "5":
         from PyQt5.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget

diff --git a/docs/releasenotes/8.2.0.rst b/docs/releasenotes/8.2.0.rst
@@ -34,7 +34,8 @@ TODO
 Other Changes
 =============
 
-TODO
-^^^^
+PyQt6
+^^^^^
 
-TODO
+Support has been added for PyQt6. If it is installed, it will be used instead of
+PySide6, PyQt5 or PySide2.
diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py
@@ -23,6 +23,7 @@
 from ._util import isPath
 
 qt_versions = [
+    ["6", "PyQt6"],
     ["side6", "PySide6"],
     ["5", "PyQt5"],
     ["side2", "PySide2"],
@@ -32,7 +33,10 @@
 qt_versions.sort(key=lambda qt_version: qt_version[1] in sys.modules, reverse=True)
 for qt_version, qt_module in qt_versions:
     try:
-        if qt_module == "PySide6":
+        if qt_module == "PyQt6":
+            from PyQt6.QtCore import QBuffer, 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
         elif qt_module == "PyQt5":
@@ -63,7 +67,8 @@ def fromqimage(im):
     (given either as Python string or a PyQt string object)
     """
     buffer = QBuffer()
-    buffer.open(QIODevice.ReadWrite)
+    qt_openmode = QIODevice.OpenMode if qt_version == "6" else QIODevice
+    buffer.open(qt_openmode.ReadWrite)
     # preserve alpha channel with png
     # otherwise ppm is more friendly with Image.open
     if im.hasAlphaChannel():
@@ -132,25 +137,26 @@ def _toqclass_helper(im):
     if isPath(im):
         im = Image.open(im)
 
+    qt_format = QImage.Format if qt_version == "6" else QImage
     if im.mode == "1":
-        format = QImage.Format_Mono
+        format = qt_format.Format_Mono
     elif im.mode == "L":
-        format = QImage.Format_Indexed8
+        format = qt_format.Format_Indexed8
         colortable = []
         for i in range(256):
             colortable.append(rgb(i, i, i))
     elif im.mode == "P":
-        format = QImage.Format_Indexed8
+        format = qt_format.Format_Indexed8
         colortable = []
         palette = im.getpalette()
         for i in range(0, len(palette), 3):
             colortable.append(rgb(*palette[i : i + 3]))
     elif im.mode == "RGB":
         data = im.tobytes("raw", "BGRX")
-        format = QImage.Format_RGB32
+        format = qt_format.Format_RGB32
     elif im.mode == "RGBA":
         data = im.tobytes("raw", "BGRA")
-        format = QImage.Format_ARGB32
+        format = qt_format.Format_ARGB32
     else:
         raise ValueError(f"unsupported image mode {repr(im.mode)}")