GIT_REPOSITORIES/LPP/PythonQt Commit - r30:a523f73e74c6

added support for setattr to allow derived classes to add own attributes...

florianlink -

r30:a523f73e74c6

parent child

Context file:

r30:a523f73e74c6

Collapse all files

src/PythonQtClassWrapper.cpp +2 -10

                return NULL;
              }
-             static int PythonQtClassWrapper_setattro(PyObject *obj,PyObject *name,PyObject * /*value*/)
+             static int PythonQtClassWrapper_setattro(PyObject *obj,PyObject *name,PyObject *value)
              {
-               QString error;
-               char *attributeName;
-               if ((attributeName = PyString_AsString(name)) == NULL) {
-                 return -1;
+               }
-               PythonQtClassWrapper *wrapper = (PythonQtClassWrapper *)obj;
-               // TODO
-               return -1;
+               return PyType_Type.tp_setattro(obj,name,value);
              }
              /*

src/PythonQtInstanceWrapper.cpp +22 -10

                return 0;
              }
-             static PyObject *PythonQtInstanceWrapper_classname(PythonQtInstanceWrapper* type)
+             static PyObject *PythonQtInstanceWrapper_classname(PythonQtInstanceWrapper* obj)
              {
-               return PyString_FromString(type->classInfo()->className());
+               return PyString_FromString(obj->ob_type->tp_name);
              }
-             static PyObject *PythonQtInstanceWrapper_help(PythonQtInstanceWrapper* type)
+             static PyObject *PythonQtInstanceWrapper_help(PythonQtInstanceWrapper* obj)
              {
-               return PythonQt::self()->helpCalled(type->classInfo());
+               return PythonQt::self()->helpCalled(obj->classInfo());
              }
              static PyObject *PythonQtInstanceWrapper_delete(PythonQtInstanceWrapper * self)
                    PyDict_SetItemString(dict, name.toLatin1().data(), o);
                    Py_DECREF(o);
                  }
+                 // TODO xxx:
+                 // this does include python member methods, but not attributes, from where can we get
+                 // the correct dict with the attributes of the derive
                  // Note: we do not put children into the dict, is would look confusing?!
                  return dict;
                }
                        + QString(value->ob_type->tp_name) + " (" + PythonQtConv::PyObjGetRepresentation(value) + ")";
                    }
                  } else {
-                   error = QString("Property '") + attributeName + "' of " + wrapper->classInfo()->className() + " object is not writable";
+                   error = QString("Property '") + attributeName + "' of " + obj->ob_type->tp_name + " object is not writable";
                  }
-               } else {
-                 if (member._type == PythonQtMemberInfo::Slot) {
-                   error = QString("Slot '") + attributeName + "' can not be overwritten on " + wrapper->classInfo()->className() + " object";
+               } else if (member._type == PythonQtMemberInfo::Slot) {
+                 error = QString("Slot '") + attributeName + "' can not be overwritten on " + obj->ob_type->tp_name + " object";
-                 } else if (member._type == PythonQtMemberInfo::EnumValue) {
-                   error = QString("EnumValue '") + attributeName + "' can not be overwritten on " + wrapper->classInfo()->className() + " object";
+                 error = QString("EnumValue '") + attributeName + "' can not be overwritten on " + obj->ob_type->tp_name + " object";
+               } else if (member._type == PythonQtMemberInfo::NotFound) {
+                 // if we are a derived python class, we allow setting attributes.
+                 // if we are a direct CPP wrapper, we do NOT allow it, since
+                 // it would be confusing to allow it because a wrapper will go away when it is not seen by python anymore
+                 // and when it is recreated from a CPP pointer the attributes are gone...
+                 if (obj->ob_type->tp_base != &PythonQtInstanceWrapper_Type) {
+                   return PyBaseObject_Type.tp_setattro(obj,name,value);
+                 } else {
+                   error = QString("'") + attributeName + "' does not exist on " + obj->ob_type->tp_name + " and creating new attributes on C++ objects is not allowed";
                  }
                }
                    return PyString_FromFormat("%s (C++ Object %p)", typeName, wrapper->_wrappedPtr);
                  }
                } else {
-                 return PyString_FromFormat("%s (QObject %p)", wrapper->classInfo()->className(), qobj);
+                 return PyString_FromFormat("%s (QObject %p)", typeName, wrapper->classInfo()->className(), qobj);
                }
              }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages