jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug#563 - "Unhandled signal emitting with invalid signature (which leads to application crash)"

Browse source
This commit is contained in:
Hugo Parente Lima 2010-12-28 14:50:46 -02:00
commit e8c0ba238a
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libpyside/signalmanager.cpp
View file

@ -188,7 +188,7 @@ static bool emitNormalSignal(QObject* source, int signalIndex, const char* signa
Shiboken::AutoDecRef sequence(PySequence_Fast(args, 0)); Shiboken::AutoDecRef sequence(PySequence_Fast(args, 0));
int argsGiven = PySequence_Fast_GET_SIZE(sequence.object()); int argsGiven = PySequence_Fast_GET_SIZE(sequence.object());
if (argsGiven > argTypes.count()) { if (argsGiven != argTypes.count()) {
PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", signal, argTypes.count(), argsGiven); PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", signal, argTypes.count(), argsGiven);
return false; return false;
} }

2
tests/QtDeclarative/bug_456.py
View file

@ -33,7 +33,7 @@ class TestConnectionWithInvalidSignature(TimedQApplication):
root = view.rootObject() root = view.rootObject()
button = root.findChild(QtCore.QObject, "buttonMouseArea") button = root.findChild(QtCore.QObject, "buttonMouseArea")
view.show() view.show()
button.clicked.emit() button.entered.emit()
self.assertEqual(rotatevalue.rotation, 100) self.assertEqual(rotatevalue.rotation, 100)
if __name__ == '__main__': if __name__ == '__main__':

2
tests/QtDeclarative/bug_456.qml
View file

@ -56,7 +56,7 @@ Rectangle {
id: buttonMouseArea id: buttonMouseArea
objectName: "buttonMouseArea" objectName: "buttonMouseArea"
anchors.fill: parent anchors.fill: parent
onClicked: { onEntered: {
rotatevalue.rotation = rotatevalue.val() rotatevalue.rotation = rotatevalue.val()
} }
} }

6
tests/QtDeclarative/connect_python_qml.py
View file

@ -19,9 +19,9 @@ class TestConnectionWithInvalidSignature(TimedQApplication):
view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('connect_python_qml.qml', __file__))) view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('connect_python_qml.qml', __file__)))
root = view.rootObject() root = view.rootObject()
button = root.findChild(QtCore.QObject, "buttonMouseArea") button = root.findChild(QtCore.QObject, "buttonMouseArea")
self.assertRaises(TypeError, QtCore.QObject.connect, [button,QtCore.SIGNAL('clicked()'), self.onButtonFailClicked]) self.assertRaises(TypeError, QtCore.QObject.connect, [button,QtCore.SIGNAL('entered()'), self.onButtonFailClicked])
button.clicked.connect(self.onButtonClicked) button.entered.connect(self.onButtonClicked)
button.clicked.emit() button.entered.emit()
view.show() view.show()
self.app.exec_() self.app.exec_()
self.assert_(self.buttonClicked) self.assert_(self.buttonClicked)