allow to override QVariantList conversion

autodetect RichCompare

Author: florianlink

src/PythonQtClassInfo.cpp

@@ -61,6 +61,7 @@ PythonQtClassInfo::PythonQtClassInfo() {
   _typeSlots = 0;
   _isQObject = false;
   _enumsCreated = false;
+  _richCompareDetectionDone = false;
   _searchPolymorphicHandlerOnParent = true;
   _searchRefCountCB = true;
   _refCallback = NULL;
@@ -1034,6 +1035,34 @@ PythonQtClassInfo* PythonQtClassInfo::getClassInfoForProperty( const QString& na
   }
   return NULL;
 }
+
+bool PythonQtClassInfo::supportsRichCompare()
+{
+  if (_typeSlots & PythonQt::Type_RichCompare) {
+    return true;
+  }
+  if (!_richCompareDetectionDone) {
+    _richCompareDetectionDone = true;
+    static QList<QByteArray> names;
+    if (names.isEmpty()) {
+      names << "__eq__";
+      names << "__ne__";
+      names << "__lt__";
+      names << "__le__";
+      names << "__gt__";
+      names << "__ge__";
+    }
+    foreach (const QByteArray& name, names) {
+      if (member(name)._type == PythonQtMemberInfo::Slot) {
+        // we found one of the operators, so we can support the type slot
+        _typeSlots |= PythonQt::Type_RichCompare;
+        break;
+      }
+    }
+  }
+  return (_typeSlots & PythonQt::Type_RichCompare);
+}
+
 //-------------------------------------------------------------------------
 
 PythonQtMemberInfo::PythonQtMemberInfo( PythonQtSlotInfo* info )

src/PythonQtClassInfo.h

@@ -185,7 +185,7 @@ class PYTHONQT_EXPORT PythonQtClassInfo {
   void setShellSetInstanceWrapperCB(PythonQtShellSetInstanceWrapperCB* cb) {
     _shellSetInstanceWrapperCB = cb;
   }
-
+  
   //! get the shell set instance wrapper cb
   PythonQtShellSetInstanceWrapperCB* shellSetInstanceWrapperCB() {
     return _shellSetInstanceWrapperCB;
@@ -230,6 +230,12 @@ class PYTHONQT_EXPORT PythonQtClassInfo {
   //! Returns the class info for given property, if available.
   PythonQtClassInfo* getClassInfoForProperty( const QString& name );
 
+  //! Returns if the class supports rich compare. This tests for
+  //! __eq__, __ne__, __lt__, __le__, __gt__, __ge__ slots and if
+  //! any of the slots is present it returns true and modifies the
+  //! _typeSlots with Type_RichCompare. The result is cached internally.
+  bool supportsRichCompare();
+
 private:
   void updateRefCountingCBs();
 
@@ -289,6 +295,7 @@ class PYTHONQT_EXPORT PythonQtClassInfo {
 
   bool _isQObject;
   bool _enumsCreated;
+  bool _richCompareDetectionDone;
   bool _searchPolymorphicHandlerOnParent;
   bool _searchRefCountCB;
 

src/PythonQtConversion.cpp

@@ -55,6 +55,8 @@ PythonQtValueStorageWithCleanup<QVariant, 128> PythonQtConv::global_variantStora
 QHash<int, PythonQtConvertMetaTypeToPythonCB*> PythonQtConv::_metaTypeToPythonConverters;
 QHash<int, PythonQtConvertPythonToMetaTypeCB*> PythonQtConv::_pythonToMetaTypeConverters;
 
+PythonQtConvertPythonSequenceToQVariantListCB* PythonQtConv::_pythonSequenceToQVariantListCB = NULL;
+
 PyObject* PythonQtConv::GetPyBool(bool val)
 {
   PyObject* r = val?Py_True:Py_False;
@@ -1028,13 +1030,13 @@ QVariant PythonQtConv::PyObjToQVariant(PyObject* val, int type)
         v = qVariantFromValue(myObject);
       }
       return v;
+    } else if (val == Py_None) {
+      // none is invalid
+      type = QVariant::Invalid;
     } else if (PyDict_Check(val)) {
       type = QVariant::Map;
     } else if (PyList_Check(val) || PyTuple_Check(val) || PySequence_Check(val)) {
       type = QVariant::List;
-    } else if (val == Py_None) {
-      // none is invalid
-      type = QVariant::Invalid;
     } else {
       // this used to be:
       // type = QVariant::String;
@@ -1152,6 +1154,12 @@ QVariant PythonQtConv::PyObjToQVariant(PyObject* val, int type)
     break;
   case QVariant::List:
     if (PySequence_Check(val)) {
+      if (_pythonSequenceToQVariantListCB) {
+        QVariant result = (*_pythonSequenceToQVariantListCB)(val);
+        if (result.isValid()) {
+          return result;
+        }
+      }
       int count = PySequence_Size(val);
       if (count >= 0) {
         // only get items if size is valid (>= 0)

src/PythonQtConversion.h

@@ -52,6 +52,7 @@
 
 typedef PyObject* PythonQtConvertMetaTypeToPythonCB(const void* inObject, int metaTypeId);
 typedef bool PythonQtConvertPythonToMetaTypeCB(PyObject* inObject, void* outObject, int metaTypeId, bool strict);
+typedef QVariant PythonQtConvertPythonSequenceToQVariantListCB(PyObject* inObject);
 
 #define PythonQtRegisterListTemplateConverter(type, innertype) \
 { int typeId = qRegisterMetaType<type<innertype > >(#type"<"#innertype">"); \
@@ -164,6 +165,10 @@ class PYTHONQT_EXPORT PythonQtConv {
   //! register a converter callback from cpp to python for given metatype
   static void registerMetaTypeToPythonConverter(int metaTypeId, PythonQtConvertMetaTypeToPythonCB* cb) { _metaTypeToPythonConverters.insert(metaTypeId, cb); }
 
+  //! set a callback that is called when a Python sequence should be converted to a QVariantList
+  //! to allow special conversion.
+  static void setPythonSequenceToQVariantListCallback(PythonQtConvertPythonSequenceToQVariantListCB* cb) { _pythonSequenceToQVariantListCB = cb; }
+
   //! converts the Qt parameter given in \c data, interpreting it as a \c type registered qvariant/meta type, into a Python object,
   static PyObject* convertQtValueToPythonInternal(int type, const void* data);
 
@@ -194,6 +199,7 @@ class PYTHONQT_EXPORT PythonQtConv {
 protected:
   static QHash<int, PythonQtConvertMetaTypeToPythonCB*> _metaTypeToPythonConverters; 
   static QHash<int, PythonQtConvertPythonToMetaTypeCB*> _pythonToMetaTypeConverters; 
+  static PythonQtConvertPythonSequenceToQVariantListCB*  _pythonSequenceToQVariantListCB;
 
   //! handle automatic conversion of some special types (QColor, QBrush, ...)
   static void* handlePythonToQtAutoConversion(int typeId, PyObject* obj, void* alreadyAllocatedCPPObject);

src/PythonQtInstanceWrapper.cpp

@@ -238,7 +238,7 @@ static PyObject *PythonQtInstanceWrapper_richcompare(PythonQtInstanceWrapper* wr
     }
   }
 
-  if ((wrapper->classInfo()->typeSlots() & PythonQt::Type_RichCompare) == 0) {
+  if (!wrapper->classInfo()->supportsRichCompare()) {
     // shortcut if richcompare is not supported:
     if (validPtrs && code == Py_EQ) {
       return PythonQtConv::GetPyBool(areSamePtrs);

src/PythonQtStdOut.cpp

@@ -47,6 +47,7 @@ static PyObject *PythonQtStdOutRedirect_new(PyTypeObject *type, PyObject * /*arg
   self = (PythonQtStdOutRedirect *)type->tp_alloc(type, 0);
 
   self->softspace = 0;
+  self->closed = false;
   self->_cb = NULL;
 
   return (PyObject *)self;
@@ -117,6 +118,9 @@ static PyMemberDef PythonQtStdOutRedirect_members[] = {
   {const_cast<char*>("softspace"), T_INT, offsetof(PythonQtStdOutRedirect, softspace), 0,
     const_cast<char*>("soft space flag")
   },
+  { const_cast<char*>("closed"), T_BOOL, offsetof(PythonQtStdOutRedirect, closed), 0,
+  const_cast<char*>("soft space flag")
+  },
   {NULL}  /* Sentinel */
 };
 

src/PythonQtStdOut.h

@@ -59,6 +59,7 @@ typedef struct {
   PyObject_HEAD
   PythonQtOutputChangedCB* _cb;
   int softspace;
+  bool closed;
 } PythonQtStdOutRedirect;
 
 #endif