diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-15 10:40:52 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-15 10:54:56 -0300 |
commit | cd7dac40f758f821514693c6d7d4c449a9f81240 (patch) | |
tree | bdb4ce55c996e45c1415fc0b678addf8291dccd3 /libpyside | |
parent | 5ce6221efae57de30c04f1069d294f4e6275bf85 (diff) |
Don't ignore exceptions caused by property getters and setters.
The exception is ignored only if the call was a meta call.
Diffstat (limited to 'libpyside')
-rw-r--r-- | libpyside/qproperty.cpp | 6 | ||||
-rw-r--r-- | libpyside/signalmanager.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libpyside/qproperty.cpp b/libpyside/qproperty.cpp index dc36e3e9f..e0f2574d8 100644 --- a/libpyside/qproperty.cpp +++ b/libpyside/qproperty.cpp @@ -188,11 +188,7 @@ PyObject* qproperty_get(PyObject* self, PyObject* source) Shiboken::AutoDecRef args(PyTuple_New(1)); Py_INCREF(source); PyTuple_SET_ITEM(args, 0, source); - PyObject *ret = PyObject_CallObject(data->fget, args); - if (!ret) { - PyErr_Print(); - } - return ret; + return PyObject_CallObject(data->fget, args); } return 0; } diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp index f9c36eeae..8208796b2 100644 --- a/libpyside/signalmanager.cpp +++ b/libpyside/signalmanager.cpp @@ -377,6 +377,8 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, args[0] = data; Py_DECREF(value); + } else if (PyErr_Occurred()) { + PyErr_Print(); // Clear any errors but print them to stderr } break; } |