added support for attribute lookup error callback

florianlink · florianlink · commit b7f250bae4f7 · 2018-06-25T11:07:01.000Z
diff --git a/src/PythonQt.cpp b/src/PythonQt.cpp
@@ -444,6 +444,20 @@ void PythonQt::qObjectNoLongerWrappedCB(QObject* o)
   };
 }
 
+void PythonQt::setQObjectMissingAttributeCallback(PythonQtQObjectMissingAttributeCB* cb)
+{
+  _self->_p->_qObjectMissingAttribCB = cb;
+}
+
+QString PythonQt::qObjectMissingAttributeCallback(QObject* o, const QString& attribute)
+{
+  if (_self && _self->_p && _self->_p->_qObjectMissingAttribCB) {
+    return _self->_p->_qObjectMissingAttribCB(o, attribute);
+  } else {
+    return QString();
+  }
+}
+
 void PythonQt::registerClass(const QMetaObject* metaobject, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell)
 {
   _p->registerClass(metaobject, package, wrapperCreator, shell);
@@ -1095,7 +1109,7 @@ QStringList PythonQt::introspection(PyObject* module, const QString& objectname,
   if (object) {
     results = introspectObject(object, type);
   }
-  
+  PyErr_Clear();
   return results;
 }
 
@@ -1216,6 +1230,7 @@ QStringList PythonQt::introspectObject(PyObject* object, ObjectType type)
       Py_DECREF(keys);
     }
   }
+  PyErr_Clear();
   return results;
 }
 
@@ -1243,6 +1258,7 @@ PyObject* PythonQt::getObjectByType(const QString& typeName)
     }
   }
   
+  PyErr_Clear();
   return object;
 }
   
@@ -1270,6 +1286,7 @@ QStringList PythonQt::introspectType(const QString& typeName, ObjectType type)
     results = introspectObject(object, type);
     Py_DECREF(object);
   }
+  PyErr_Clear();
   return results;
 }
 
@@ -1403,6 +1420,7 @@ PythonQtPrivate::PythonQtPrivate()
   _defaultImporter = new PythonQtQFileImporter;
   _noLongerWrappedCB = NULL;
   _wrappedCB = NULL;
+  _qObjectMissingAttribCB = NULL;
   _currentClassInfoForClassWrapperCreation = NULL;
   _profilingCB = NULL;
   _hadError = false;
diff --git a/src/PythonQt.h b/src/PythonQt.h
@@ -73,6 +73,7 @@ typedef void  PythonQtVoidPtrCB(void* object);
 typedef void  PythonQtQObjectWrappedCB(QObject* object);
 typedef void  PythonQtQObjectNoLongerWrappedCB(QObject* object);
 typedef void* PythonQtPolymorphicHandlerCB(const void *ptr, const char **class_name);
+typedef QString PythonQtQObjectMissingAttributeCB(QObject* object, const QString& attribute);
 
 typedef void PythonQtShellSetInstanceWrapperCB(void* object, PythonQtInstanceWrapper* wrapper);
 
@@ -583,6 +584,12 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
   //! call the callback if it is set
   static void qObjectNoLongerWrappedCB(QObject* o);
 
+  //! set a callback that is called when a QObject does not have a specific attribute.
+  void setQObjectMissingAttributeCallback(PythonQtQObjectMissingAttributeCB* cb);
+
+  //! call the callback if it is set
+  static QString qObjectMissingAttributeCallback(QObject* o, const QString& attribute);
+
   //! called by internal help methods
   PyObject* helpCalled(PythonQtClassInfo* info);
 
@@ -820,6 +827,7 @@ class PYTHONQT_EXPORT PythonQtPrivate : public QObject {
 
   PythonQtQObjectNoLongerWrappedCB* _noLongerWrappedCB;
   PythonQtQObjectWrappedCB* _wrappedCB;
+  PythonQtQObjectMissingAttributeCB* _qObjectMissingAttribCB;
 
   QStringList _importIgnorePaths;
   QStringList _sharedLibrarySuffixes;
diff --git a/src/PythonQtInstanceWrapper.cpp b/src/PythonQtInstanceWrapper.cpp
@@ -596,7 +596,11 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
   }
 
   QString error = QString(wrapper->classInfo()->className()) + " has no attribute named '" + QString(attributeName) + "'";
+  if (wrapper->_obj) {
+    error += PythonQt::self()->qObjectMissingAttributeCallback(wrapper->_obj, QString(attributeName));
+  }
   PyErr_SetString(PyExc_AttributeError, QStringToPythonConstCharPointer(error));
+
   return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,20 @@ void PythonQt::qObjectNoLongerWrappedCB(QObject* o)`
`444`	`444`	`};`
`445`	`445`	`}`
`446`	`446`
	`447`	`+void PythonQt::setQObjectMissingAttributeCallback(PythonQtQObjectMissingAttributeCB* cb)`
	`448`	`+{`
	`449`	`+ _self->_p->_qObjectMissingAttribCB = cb;`
	`450`	`+}`
	`451`	`+`
	`452`	`+QString PythonQt::qObjectMissingAttributeCallback(QObject* o, const QString& attribute)`
	`453`	`+{`
	`454`	`+ if (_self && _self->_p && _self->_p->_qObjectMissingAttribCB) {`
	`455`	`+ return _self->_p->_qObjectMissingAttribCB(o, attribute);`
	`456`	`+ } else {`
	`457`	`+ return QString();`
	`458`	`+ }`
	`459`	`+}`
	`460`	`+`
`447`	`461`	`void PythonQt::registerClass(const QMetaObject* metaobject, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell)`
`448`	`462`	`{`
`449`	`463`	`_p->registerClass(metaobject, package, wrapperCreator, shell);`
`@@ -1095,7 +1109,7 @@ QStringList PythonQt::introspection(PyObject* module, const QString& objectname,`
`1095`	`1109`	`if (object) {`
`1096`	`1110`	`results = introspectObject(object, type);`
`1097`	`1111`	`}`
`1098`		`-`
	`1112`	`+ PyErr_Clear();`
`1099`	`1113`	`return results;`
`1100`	`1114`	`}`
`1101`	`1115`
`@@ -1216,6 +1230,7 @@ QStringList PythonQt::introspectObject(PyObject* object, ObjectType type)`
`1216`	`1230`	`Py_DECREF(keys);`
`1217`	`1231`	`}`
`1218`	`1232`	`}`
	`1233`	`+ PyErr_Clear();`
`1219`	`1234`	`return results;`
`1220`	`1235`	`}`
`1221`	`1236`
`@@ -1243,6 +1258,7 @@ PyObject* PythonQt::getObjectByType(const QString& typeName)`
`1243`	`1258`	`}`
`1244`	`1259`	`}`
`1245`	`1260`
	`1261`	`+ PyErr_Clear();`
`1246`	`1262`	`return object;`
`1247`	`1263`	`}`
`1248`	`1264`
`@@ -1270,6 +1286,7 @@ QStringList PythonQt::introspectType(const QString& typeName, ObjectType type)`
`1270`	`1286`	`results = introspectObject(object, type);`
`1271`	`1287`	`Py_DECREF(object);`
`1272`	`1288`	`}`
	`1289`	`+ PyErr_Clear();`
`1273`	`1290`	`return results;`
`1274`	`1291`	`}`
`1275`	`1292`
`@@ -1403,6 +1420,7 @@ PythonQtPrivate::PythonQtPrivate()`
`1403`	`1420`	`_defaultImporter = new PythonQtQFileImporter;`
`1404`	`1421`	`_noLongerWrappedCB = NULL;`
`1405`	`1422`	`_wrappedCB = NULL;`
	`1423`	`+ _qObjectMissingAttribCB = NULL;`
`1406`	`1424`	`_currentClassInfoForClassWrapperCreation = NULL;`
`1407`	`1425`	`_profilingCB = NULL;`
`1408`	`1426`	`_hadError = false;`
Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,11 @@ static PyObject PythonQtInstanceWrapper_getattro(PyObject obj,PyObject *name)`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`QString error = QString(wrapper->classInfo()->className()) + " has no attribute named '" + QString(attributeName) + "'";`
	`599`	`+ if (wrapper->_obj) {`
	`600`	`+ error += PythonQt::self()->qObjectMissingAttributeCallback(wrapper->_obj, QString(attributeName));`
	`601`	`+ }`
`599`	`602`	`PyErr_SetString(PyExc_AttributeError, QStringToPythonConstCharPointer(error));`
	`603`	`+`
`600`	`604`	`return NULL;`
`601`	`605`	`}`
`602`	`606`