GIT_REPOSITORIES/LPP/PythonQt Commit - r210:d5ac67324004

Modify typesystems to #ifdef PyString

Orochimarufan -

r210:d5ac67324004

parent child

Context file:

r210:d5ac67324004

generator/shellimplgenerator.cpp +1 -1

                   AbstractMetaArgumentList args = fun->arguments();
                   s << "if (_wrapper && (_wrapper->ob_refcnt > 0)) {" << endl;
-                  s << "  static PyObject* name = PyString_FromString(\"" << fun->name() << "\");" << endl;
+                  s << "#ifdef PY3K\n  static PyObject* name = PyUnicode_FromString(\"" << fun->name() << "\");\n#else\n  static PyObject* name = PyString_FromString(\"" << fun->name() << "\");\n#endif" << endl;
                   s << "  PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);" << endl;
                   s << "  if (obj) {" << endl;
                   s << "    static const char* argumentList[] ={\"";

generator/typesystem_core-qtscript.xml +4 0

                 <inject-code class="pywrap-h">
               PyObject* data(QByteArray* b) {
                 if (b->data()) {
+            #ifdef PY3K
+                  return PyUnicode_FromStringAndSize(b->data(), b->size());
+            #else
                   return PyString_FromStringAndSize(b->data(), b->size());
+            #endif
                 } else {
                   Py_INCREF(Py_None);
                   return Py_None;

generator/typesystem_core.xml +8 0

                 <inject-code class="pywrap-h">
               PyObject* data(QByteArray* b) {
+            #ifdef PY3K
+                return PyUnicode_FromStringAndSize(b-&gt;data(), b-&gt;size());
+            #else
                 return PyString_FromStringAndSize(b-&gt;data(), b-&gt;size());
+            #endif
               }
                 </inject-code>
                  r.resize(len);
                  int result = d-&gt;readRawData(r.data(), r.size());
                  if (result&gt;=0) {
+            #ifdef PY3K
+                   return PyUnicode_FromStringAndSize(r.data(), result);
+            #else
                    return PyString_FromStringAndSize(r.data(), result);
+            #endif
                  } else {
                    Py_INCREF(Py_None);
                    return Py_None;

generator_50/typesystem_core-qtscript.xml +14 -10

@@ -356,16 +356,20
356	</object-type>	356	</object-type>
357		357
358	<value-type name="QByteArray">	358	<value-type name="QByteArray">
359	<inject-code class="pywrap-h">	359	<inject-code class="pywrap-h">
360	PyObject* data(QByteArray* b) {	360	PyObject* data(QByteArray* b) {
361	if (b->data()) {	361	if (b->data()) {
362	return PyString_FromStringAndSize(b->data(), b->size());	362	#ifdef PY3K
363	} else {	363	return PyUnicode_FromStringAndSize(b->data(), b->size());
364	Py_INCREF(Py_None);	364	#else
365	return Py_None;	365	return PyString_FromStringAndSize(b->data(), b->size());
366	}	366	#endif
367	}	367	} else {
368	</inject-code>	368	Py_INCREF(Py_None);
		369	return Py_None;
		370	}
		371	}
		372	</inject-code>
369		373
370	<inject-code class="native" position="beginning">	374	<inject-code class="native" position="beginning">
371	Q_DECLARE_METATYPE(QScriptValue)	375	Q_DECLARE_METATYPE(QScriptValue)

generator_50/typesystem_core.xml +4 0

                 <inject-code class="pywrap-h">
               PyObject* data(QByteArray* b) {
                 if (b-&gt;data()) {
+            #ifdef PY3K
+                  return PyUnicode_FromStringAndSize(b-&gt;data(), b-&gt;size());
+            #else
                   return PyString_FromStringAndSize(b-&gt;data(), b-&gt;size());
+            #endif
                 } else {
                   Py_INCREF(Py_None);
                   return Py_None;

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