jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated QtScript modue to works with python 2.x and 3.x

Browse source
This commit is contained in:
Renato Filho 2011-10-06 11:39:08 -03:00 • committed by Hugo Parente Lima
commit 1f1fbfbfa8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PySide/QtScript/typesystem_script.xml
View file

@ -62,7 +62,7 @@
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
if (%CPPSELF.isVariant() || %CPPSELF.isString()) { if (%CPPSELF.isVariant() || %CPPSELF.isString()) {
QString format = QString().sprintf("%s(\"%s\")", ((PyObject*)%PYSELF)->ob_type->tp_name, qPrintable(%CPPSELF.toString())); QString format = QString().sprintf("%s(\"%s\")", ((PyObject*)%PYSELF)->ob_type->tp_name, qPrintable(%CPPSELF.toString()));
%PYARG_0 = PyString_FromString(qPrintable(format)); %PYARG_0 = Shiboken::String::fromCString(qPrintable(format));
} else { } else {
%PYARG_0 = PyObject_Str((PyObject*)%PYSELF); %PYARG_0 = PyObject_Str((PyObject*)%PYSELF);
} }
@ -71,7 +71,7 @@
<add-function signature="__mgetitem__"> <add-function signature="__mgetitem__">
<inject-code> <inject-code>
Shiboken::AutoDecRef key(PyObject_Str(_key)); Shiboken::AutoDecRef key(PyObject_Str(_key));
QVariant res = %CPPSELF.property(PyString_AS_STRING(key.object())).toVariant(); QVariant res = %CPPSELF.property(Shiboken::String::toCString(key.object())).toVariant();
if (res.isValid()) { if (res.isValid()) {
return %CONVERTTOPYTHON[QVariant](res); return %CONVERTTOPYTHON[QVariant](res);
} else { } else {