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

Fix bug #835 - "pyside breaks descriptor protocol"

Browse source 
Signed-off-by: Paulo Alcantara <paulo.alcantara@openbossa.org>

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Paulo Alcantara 2011-05-05 16:50:01 -03:00 • committed by Renato Filho
commit 6e95894d10
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libpyside/pysideproperty.cpp
View file

@ -255,7 +255,6 @@ int reset(PySideProperty* self, PyObject* source)
return -1; return -1;
} }
const char* getTypeName(const PySideProperty* self) const char* getTypeName(const PySideProperty* self)
{ {
return self->d->typeName; return self->d->typeName;
@ -263,14 +262,25 @@ const char* getTypeName(const PySideProperty* self)
PySideProperty* getObject(PyObject* source, PyObject* name) PySideProperty* getObject(PyObject* source, PyObject* name)
{ {
PyObject* attr = PyObject_GenericGetAttr(source, name); PyObject* attr = 0;
if (attr && isPropertyType(attr))
if (Shiboken::Object::isUserType(source)) {
PyObject* dict = reinterpret_cast<SbkObject*>(source)->ob_dict;
if (dict)
attr = PyDict_GetItem(dict, name);
}
if (!attr)
attr = PyDict_GetItem(source->ob_type->tp_dict, name);
if (attr && isPropertyType(attr)) {
Py_INCREF(attr);
return reinterpret_cast<PySideProperty*>(attr); return reinterpret_cast<PySideProperty*>(attr);
}
if (!attr) if (!attr)
PyErr_Clear(); //Clear possible error caused by PyObject_GenericGetAttr PyErr_Clear(); //Clear possible error caused by PyObject_GenericGetAttr
else
Py_DECREF(attr);
return 0; return 0;
} }