From eaf55225d8f686d40bfc9e47834f2c765520a06f 2009-06-23 13:41:28
From: florianlink <florianlink@ea8d5007-eb21-0410-b261-ccb3ea6e24a9>
Date: 2009-06-23 13:41:28
Subject: [PATCH] improved error handling on destroyed objects (since static access should still be possible)

git-svn-id: svn://svn.code.sf.net/p/pythonqt/code/trunk@114 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

---

diff --git a/src/PythonQtInstanceWrapper.cpp b/src/PythonQtInstanceWrapper.cpp
index e3cfa99..75427c6 100644
--- a/src/PythonQtInstanceWrapper.cpp
+++ b/src/PythonQtInstanceWrapper.cpp
@@ -228,16 +228,18 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
     PyObject* dict = PyBaseObject_Type.tp_getattro(obj, name);
     dict = PyDict_Copy(dict);
 
-    // only the properties are missing, the rest is already available from
-    // PythonQtClassWrapper...
-    QStringList l = wrapper->classInfo()->propertyList();
-    foreach (QString name, l) {
-      PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
-      if (o) {
-        PyDict_SetItemString(dict, name.toLatin1().data(), o);
-        Py_DECREF(o);
-      } else {
-        std::cerr << "PythonQtInstanceWrapper: something is wrong, could not get attribute " << name.toLatin1().data();
+    if (wrapper->_obj) {
+      // only the properties are missing, the rest is already available from
+      // PythonQtClassWrapper...
+      QStringList l = wrapper->classInfo()->propertyList();
+      foreach (QString name, l) {
+        PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
+        if (o) {
+          PyDict_SetItemString(dict, name.toLatin1().data(), o);
+          Py_DECREF(o);
+        } else {
+          std::cerr << "PythonQtInstanceWrapper: something is wrong, could not get attribute " << name.toLatin1().data();
+        }
       }
     }
     // Note: we do not put children into the dict, is would look confusing?!
@@ -251,12 +253,6 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
   }
   PyErr_Clear();
 
-  if (!wrapper->_obj && !wrapper->_wrappedPtr) {
-    QString error = QString("Trying to read attribute '") + attributeName + "' from a destroyed " + wrapper->classInfo()->className() + " object";
-    PyErr_SetString(PyExc_ValueError, error.toLatin1().data());
-    return NULL;
-  }
-
   //  mlabDebugConst("Python","get " << attributeName);
 
   // TODO: dynamic properties are missing
@@ -271,6 +267,10 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
         Py_INCREF(Py_None);
         return Py_None;
       }
+    } else {
+      QString error = QString("Trying to read property '") + attributeName + "' from a destroyed " + wrapper->classInfo()->className() + " object";
+      PyErr_SetString(PyExc_ValueError, error.toLatin1().data());
+      return NULL;
     }
     break;
   case PythonQtMemberInfo::Slot:
@@ -278,24 +278,24 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
     break;
   case PythonQtMemberInfo::EnumValue:
     {
-    PyObject* enumValue = member._enumValue;
-    Py_INCREF(enumValue);
-    return enumValue;
+      PyObject* enumValue = member._enumValue;
+      Py_INCREF(enumValue);
+      return enumValue;
     }
     break;
   case PythonQtMemberInfo::EnumWrapper:
     {
-    PyObject* enumWrapper = member._enumWrapper;
-    Py_INCREF(enumWrapper);
-    return enumWrapper;
+      PyObject* enumWrapper = member._enumWrapper;
+      Py_INCREF(enumWrapper);
+      return enumWrapper;
     }
     break;
-    default:
-      // is an invalid type, go on
+  default:
+    // is an invalid type, go on
     break;
   }
 
-  // look for the interal methods (className(), help())
+  // look for the internal methods (className(), help())
   PyObject* internalMethod = Py_FindMethod( PythonQtInstanceWrapper_methods, obj, (char*)attributeName);
   if (internalMethod) {
     return internalMethod;