GIT_REPOSITORIES/LPP/PythonQt Commit - r125:50c6d9f6a6dd

removed implicit conversion of QByteArray to python str, use str() to convert to Python string or QByteArray::data()...

florianlink -

r125:50c6d9f6a6dd

parent child

Context file:

r125:50c6d9f6a6dd

src/PythonQt.cpp +1 0

                 PythonQt_init_QtCoreBuiltin(NULL);
                 PythonQt_init_QtGuiBuiltin(NULL);
+                PythonQtRegisterToolClassesTemplateConverter(QByteArray);
                 PythonQtRegisterToolClassesTemplateConverter(QDate);
                 PythonQtRegisterToolClassesTemplateConverter(QTime);
                 PythonQtRegisterToolClassesTemplateConverter(QDateTime);

src/PythonQtConversion.cpp +6 -4

                 return PyLong_FromLongLong(*((qint64*)data));
               case QMetaType::ULongLong:
                 return PyLong_FromUnsignedLongLong(*((quint64*)data));
-              case QMetaType::QByteArray: {
+                  // implicit conversion from QByteArray to str has been removed:
-                QByteArray* v = (QByteArray*) data;
+              //case QMetaType::QByteArray: {
-                return PyString_FromStringAndSize(*v, v->size());
+              //  QByteArray* v = (QByteArray*) data;
+              //  return PyString_FromStringAndSize(*v, v->size());
+              //                            }
               case QMetaType::QVariantMap:
                 return PythonQtConv::QVariantMapToPyObject(*((QVariantMap*)data));
               case QMetaType::QVariantList:
             }
             QByteArray PythonQtConv::PyObjGetBytes(PyObject* val, bool /*strict*/, bool& ok) {
+              // TODO: support buffer objects in general
               QByteArray r;
               ok = true;
               if (val->ob_type == &PyString_Type) {

src/PythonQtDoc.h +1 -1

              - QObject.emit to emit Qt signals from Python is not yet implemented but PythonQt allows to just emit a signal by calling it
              - PythonQt does not (yet) offer to add new signals to Python/C++ objects
              - Ownership of objects is a bit different in PythonQt, currently Python classes derived from a C++ class need to be manually referenced in Python to not get deleted too early (this will be fixed)
-             - QString and QBytearray are always converted to unicode and str Python objects (PyQt returns QString and QByteArray instead).
+             - QStrings are always converted to unicode Python objects (PyQt returns QString instead), we prefered to return Python strings.
              - Probably there are lots of details that differ, I do not know PyQt that well to list them all.
              \section Interface

src/PythonQtInstanceWrapper.cpp +11 0

@@ -566,6 +566,17 static QString getStringFromObject(PythonQtInstanceWrapper* wrapper) {
566	static PyObject * PythonQtInstanceWrapper_str(PyObject * obj)	566	static PyObject * PythonQtInstanceWrapper_str(PyObject * obj)
567	{	567	{
568	PythonQtInstanceWrapper* wrapper = (PythonQtInstanceWrapper*)obj;	568	PythonQtInstanceWrapper* wrapper = (PythonQtInstanceWrapper*)obj;
		569
		570	// QByteArray should be directly returned as a str
		571	if (wrapper->classInfo()->metaTypeId()==QVariant::ByteArray) {
		572	QByteArray* b = (QByteArray*) wrapper->_wrappedPtr;
		573	if (b->data()) {
		574	return PyString_FromStringAndSize(b->data(), b->size());
		575	} else {
		576	return PyString_FromString("");
		577	}
		578	}
		579
569	const char* typeName = obj->ob_type->tp_name;	580	const char* typeName = obj->ob_type->tp_name;
570	QObject *qobj = wrapper->_obj;	581	QObject *qobj = wrapper->_obj;
571	QString str = getStringFromObject(wrapper);	582	QString str = getStringFromObject(wrapper);

General Comments 0

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

No TODOs yet

	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