diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-03 16:00:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-04 09:39:39 +0000 |
| commit | b628c1643cadb2a4a6fb88d336ebd4aace3bb06a (patch) | |
| tree | 574839ada486ac5f8298750c983a46afe6361eec /sources/pyside2/tests | |
| parent | e254c3c2aa140016e298107a0297885234abfde7 (diff) | |
Fix crash when mixing static overloads with instance methods in derived classes
Use METH_STATIC only when there are no instance methods in the same class.
Unearthed by a clash of QPlainTextEdit::find() and static QWidget::find(WId).
Change-Id: I891c678e004a0abc3937437b0cac26e8094853de
Fixes: PYSIDE-886
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/tests')
5 files changed, 12 insertions, 10 deletions
diff --git a/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py b/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py index 54b81acae..09e5f2610 100644 --- a/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py +++ b/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py @@ -85,15 +85,16 @@ new_functions += """ PySide2.QtWidgets.QListWidget().closePersistentEditor(qModelIndex) PySide2.QtWidgets.QListWidget().openPersistentEditor(qModelIndex) PySide2.QtWidgets.QMessageBox().open() - PySide2.QtWidgets.QPlainTextEdit.find(quintptr) + PySide2.QtWidgets.QPlainTextEdit().find(findStr) PySide2.QtWidgets.QProgressDialog().open() PySide2.QtWidgets.QStackedLayout().widget() # PySide2.QtWidgets.QStylePainter().begin(qPaintDevice) # QPaintDevice: NotImplementedError PySide2.QtWidgets.QTableWidget().closePersistentEditor(qModelIndex) PySide2.QtWidgets.QTableWidget().openPersistentEditor(qModelIndex) - PySide2.QtWidgets.QTextEdit.find(quintptr) + PySide2.QtWidgets.QTextEdit().find(findStr) PySide2.QtWidgets.QTreeWidget().closePersistentEditor(qModelIndex) PySide2.QtWidgets.QTreeWidget().openPersistentEditor(qModelIndex) + PySide2.QtWidgets.QWidget.find(quintptr) """ if "PySide2.QtWidgets" in sys.modules else "" new_functions += """ @@ -130,6 +131,7 @@ class MainTest(unittest.TestCase): int = 42 qint64 = 42 tfarg = os.path.join(PySide2.QtCore.QDir.tempPath(), "XXXXXX.tmp") + findStr = 'bla' orientation = PySide2.QtCore.Qt.Orientation() openMode = PySide2.QtCore.QIODevice.OpenMode(PySide2.QtCore.QIODevice.ReadOnly) qModelIndex = PySide2.QtCore.QModelIndex() diff --git a/sources/pyside2/tests/registry/exists_darwin_5_12_0_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_12_0_ci.py index fec591777..a2b6aa14f 100644 --- a/sources/pyside2/tests/registry/exists_darwin_5_12_0_ci.py +++ b/sources/pyside2/tests/registry/exists_darwin_5_12_0_ci.py @@ -11099,7 +11099,7 @@ if "PySide2.QtWidgets" in sys.modules: "QPlainTextEdit.ensureCursorVisible": (), "QPlainTextEdit.event": ('PySide2.QtCore.QEvent',), "QPlainTextEdit.extraSelections": (), - "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QPlainTextEdit.firstVisibleBlock": (), "QPlainTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QPlainTextEdit.focusNextPrevChild": ('bool',), @@ -12163,7 +12163,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextEdit.ensureCursorVisible": (), "QTextEdit.event": ('PySide2.QtCore.QEvent',), "QTextEdit.extraSelections": (), - "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QTextEdit.focusNextPrevChild": ('bool',), "QTextEdit.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), diff --git a/sources/pyside2/tests/registry/exists_opensuse423_5_12_0_ci.py b/sources/pyside2/tests/registry/exists_opensuse423_5_12_0_ci.py index 191a8720b..5cb8a2306 100644 --- a/sources/pyside2/tests/registry/exists_opensuse423_5_12_0_ci.py +++ b/sources/pyside2/tests/registry/exists_opensuse423_5_12_0_ci.py @@ -11097,7 +11097,7 @@ if "PySide2.QtWidgets" in sys.modules: "QPlainTextEdit.ensureCursorVisible": (), "QPlainTextEdit.event": ('PySide2.QtCore.QEvent',), "QPlainTextEdit.extraSelections": (), - "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QPlainTextEdit.firstVisibleBlock": (), "QPlainTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QPlainTextEdit.focusNextPrevChild": ('bool',), @@ -12161,7 +12161,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextEdit.ensureCursorVisible": (), "QTextEdit.event": ('PySide2.QtCore.QEvent',), "QTextEdit.extraSelections": (), - "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QTextEdit.focusNextPrevChild": ('bool',), "QTextEdit.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), diff --git a/sources/pyside2/tests/registry/exists_redhatenterpriselinuxworkstation74_5_12_0_ci.py b/sources/pyside2/tests/registry/exists_redhatenterpriselinuxworkstation74_5_12_0_ci.py index 402aa4c7e..969ac36c8 100644 --- a/sources/pyside2/tests/registry/exists_redhatenterpriselinuxworkstation74_5_12_0_ci.py +++ b/sources/pyside2/tests/registry/exists_redhatenterpriselinuxworkstation74_5_12_0_ci.py @@ -11097,7 +11097,7 @@ if "PySide2.QtWidgets" in sys.modules: "QPlainTextEdit.ensureCursorVisible": (), "QPlainTextEdit.event": ('PySide2.QtCore.QEvent',), "QPlainTextEdit.extraSelections": (), - "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QPlainTextEdit.firstVisibleBlock": (), "QPlainTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QPlainTextEdit.focusNextPrevChild": ('bool',), @@ -12161,7 +12161,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextEdit.ensureCursorVisible": (), "QTextEdit.event": ('PySide2.QtCore.QEvent',), "QTextEdit.extraSelections": (), - "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QTextEdit.focusNextPrevChild": ('bool',), "QTextEdit.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), diff --git a/sources/pyside2/tests/registry/exists_win32_5_12_0_ci.py b/sources/pyside2/tests/registry/exists_win32_5_12_0_ci.py index 406f9b2e4..189e5c74d 100644 --- a/sources/pyside2/tests/registry/exists_win32_5_12_0_ci.py +++ b/sources/pyside2/tests/registry/exists_win32_5_12_0_ci.py @@ -11110,7 +11110,7 @@ if "PySide2.QtWidgets" in sys.modules: "QPlainTextEdit.ensureCursorVisible": (), "QPlainTextEdit.event": ('PySide2.QtCore.QEvent',), "QPlainTextEdit.extraSelections": (), - "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QPlainTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QPlainTextEdit.firstVisibleBlock": (), "QPlainTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QPlainTextEdit.focusNextPrevChild": ('bool',), @@ -12174,7 +12174,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextEdit.ensureCursorVisible": (), "QTextEdit.event": ('PySide2.QtCore.QEvent',), "QTextEdit.extraSelections": (), - "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('int',), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], + "QTextEdit.find": [('PySide2.QtCore.QRegExp', 'PySide2.QtGui.QTextDocument.FindFlags'), ('str', 'PySide2.QtGui.QTextDocument.FindFlags')], "QTextEdit.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QTextEdit.focusNextPrevChild": ('bool',), "QTextEdit.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), |