Fix compatibility with PySide6 6.4.0

QuLogic · QuLogic · commit 554670a8c315 · 2022-10-14T01:12:39.000-04:00
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -69,7 +69,8 @@
 
 
 def _setup_pyqt5plus():
-    global QtCore, QtGui, QtWidgets, __version__, _isdeleted, _getSaveFileName
+    global QtCore, QtGui, QtWidgets, __version__
+    global _getSaveFileName, _isdeleted, _to_int
 
     if QT_API == QT_API_PYQT6:
         from PyQt6 import QtCore, QtGui, QtWidgets, sip
@@ -78,10 +79,15 @@ def _setup_pyqt5plus():
         QtCore.Slot = QtCore.pyqtSlot
         QtCore.Property = QtCore.pyqtProperty
         _isdeleted = sip.isdeleted
+        _to_int = operator.attrgetter('value')
     elif QT_API == QT_API_PYSIDE6:
         from PySide6 import QtCore, QtGui, QtWidgets, __version__
         import shiboken6
         def _isdeleted(obj): return not shiboken6.isValid(obj)
+        if __version__ >= '6.4':
+            _to_int = operator.attrgetter('value')
+        else:
+            _to_int = int
     elif QT_API == QT_API_PYQT5:
         from PyQt5 import QtCore, QtGui, QtWidgets
         import sip
@@ -90,6 +96,7 @@ def _isdeleted(obj): return not shiboken6.isValid(obj)
         QtCore.Slot = QtCore.pyqtSlot
         QtCore.Property = QtCore.pyqtProperty
         _isdeleted = sip.isdeleted
+        _to_int = int
     elif QT_API == QT_API_PYSIDE2:
         from PySide2 import QtCore, QtGui, QtWidgets, __version__
         try:
@@ -98,6 +105,7 @@ def _isdeleted(obj): return not shiboken6.isValid(obj)
             import shiboken2
         def _isdeleted(obj):
             return not shiboken2.isValid(obj)
+        _to_int = int
     else:
         raise AssertionError(f"Unexpected QT_API: {QT_API}")
     _getSaveFileName = QtWidgets.QFileDialog.getSaveFileName
@@ -144,9 +152,6 @@ def _isdeleted(obj):
 # PyQt6 enum compat helpers.
 
 
-_to_int = operator.attrgetter("value") if QT_API == "PyQt6" else int
-
-
 @functools.lru_cache(None)
 def _enum(name):
     # foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).
