Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit554670a

Browse files
committed
Fix compatibility with PySide6 6.4.0
1 parentd8a7253 commit554670a

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

‎lib/matplotlib/backends/qt_compat.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969

7070

7171
def_setup_pyqt5plus():
72-
globalQtCore,QtGui,QtWidgets,__version__,_isdeleted,_getSaveFileName
72+
globalQtCore,QtGui,QtWidgets,__version__
73+
global_getSaveFileName,_isdeleted,_to_int
7374

7475
ifQT_API==QT_API_PYQT6:
7576
fromPyQt6importQtCore,QtGui,QtWidgets,sip
@@ -78,10 +79,15 @@ def _setup_pyqt5plus():
7879
QtCore.Slot=QtCore.pyqtSlot
7980
QtCore.Property=QtCore.pyqtProperty
8081
_isdeleted=sip.isdeleted
82+
_to_int=operator.attrgetter('value')
8183
elifQT_API==QT_API_PYSIDE6:
8284
fromPySide6importQtCore,QtGui,QtWidgets,__version__
8385
importshiboken6
8486
def_isdeleted(obj):returnnotshiboken6.isValid(obj)
87+
if__version__>='6.4':
88+
_to_int=operator.attrgetter('value')
89+
else:
90+
_to_int=int
8591
elifQT_API==QT_API_PYQT5:
8692
fromPyQt5importQtCore,QtGui,QtWidgets
8793
importsip
@@ -90,6 +96,7 @@ def _isdeleted(obj): return not shiboken6.isValid(obj)
9096
QtCore.Slot=QtCore.pyqtSlot
9197
QtCore.Property=QtCore.pyqtProperty
9298
_isdeleted=sip.isdeleted
99+
_to_int=int
93100
elifQT_API==QT_API_PYSIDE2:
94101
fromPySide2importQtCore,QtGui,QtWidgets,__version__
95102
try:
@@ -98,6 +105,7 @@ def _isdeleted(obj): return not shiboken6.isValid(obj)
98105
importshiboken2
99106
def_isdeleted(obj):
100107
returnnotshiboken2.isValid(obj)
108+
_to_int=int
101109
else:
102110
raiseAssertionError(f"Unexpected QT_API:{QT_API}")
103111
_getSaveFileName=QtWidgets.QFileDialog.getSaveFileName
@@ -144,9 +152,6 @@ def _isdeleted(obj):
144152
# PyQt6 enum compat helpers.
145153

146154

147-
_to_int=operator.attrgetter("value")ifQT_API=="PyQt6"elseint
148-
149-
150155
@functools.lru_cache(None)
151156
def_enum(name):
152157
# foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp