chore(PythonQt): replace PyString_FromString with PyUnicode_FromString

Make Unicode creation explicit instead of relying on the compatibility
macros in `PythonQtPythonInclude.h`. No functional change intended.

Author: jcfr

src/PythonQt.cpp

@@ -766,7 +766,7 @@ PyObject* PythonQtPrivate::dummyTuple() {
   static PyObject* dummyTuple = nullptr;
   if (dummyTuple==nullptr) {
     dummyTuple = PyTuple_New(1);
-    PyTuple_SET_ITEM(dummyTuple, 0 , PyString_FromString("dummy"));
+    PyTuple_SET_ITEM(dummyTuple, 0 , PyUnicode_FromString("dummy"));
   }
   return dummyTuple;
 }
@@ -805,7 +805,7 @@ PythonQtInstanceWrapper* PythonQtPrivate::createNewPythonQtInstanceWrapper(QObje
 PythonQtClassWrapper* PythonQtPrivate::createNewPythonQtClassWrapper(PythonQtClassInfo* info, PyObject* parentModule, const QByteArray& pythonClassName) {
   PythonQtClassWrapper* result;
 
-  PyObject* className = PyString_FromString(pythonClassName.constData());
+  PyObject* className = PyUnicode_FromString(pythonClassName.constData());
 
   PyObject* baseClasses = PyTuple_New(1);
   Py_INCREF((PyObject*)&PythonQtInstanceWrapper_Type);
@@ -842,7 +842,7 @@ PyObject*  PythonQtPrivate::createEnumValueInstance(PyObject* enumType, unsigned
 PyObject* PythonQtPrivate::createNewPythonQtEnumWrapper(const char* enumName, PyObject* parentObject) {
   PyObject* result;
 
-  PyObject* className = PyString_FromString(enumName);
+  PyObject* className = PyUnicode_FromString(enumName);
 
   PyObject* baseClasses = PyTuple_New(1);
   Py_INCREF(&PyLong_Type);
@@ -1872,7 +1872,7 @@ void PythonQt::initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQ
       Py_INCREF(val);
       PyTuple_SetItem(module_names, i, val);
     }
-    PyTuple_SetItem(module_names, old_size, PyString_FromString(name.constData()));
+    PyTuple_SetItem(module_names, old_size, PyUnicode_FromString(name.constData()));
     PyModule_AddObject(sys.object(), "builtin_module_names", module_names);
   }
   Py_XDECREF(old_module_names);
@@ -2175,7 +2175,7 @@ PyObject* PythonQt::helpCalled(PythonQtClassInfo* info)
     Q_EMIT pythonHelpRequest(QByteArray(info->className()));
     return Py_BuildValue("");
   } else {
-    return PyString_FromString(QStringToPythonCharPointer(info->help()));
+    return PyUnicode_FromString(QStringToPythonCharPointer(info->help()));
   }
 }
 
@@ -2299,7 +2299,7 @@ const QMetaObject* PythonQtPrivate::buildDynamicMetaObject(PythonQtClassWrapper*
   Py_ssize_t pos = 0;
   PyObject* value = nullptr;
   PyObject* key = nullptr;
-  static PyObject* qtSlots = PyString_FromString("_qtSlots");
+  static PyObject* qtSlots = PyUnicode_FromString("_qtSlots");
 
   bool needsMetaObject = false;
   // Iterate over all members and check if they affect the QMetaObject:
@@ -2400,7 +2400,7 @@ int PythonQtPrivate::handleMetaCall(QObject* object, PythonQtInstanceWrapper* wr
     }
     PythonQtProperty* prop = nullptr;
     // Get directly from the Python class, since we don't want to get the value of the property
-    PyObject* maybeProp = PyBaseObject_Type.tp_getattro((PyObject*)wrapper, PyString_FromString(metaProp.name()));
+    PyObject* maybeProp = PyBaseObject_Type.tp_getattro((PyObject*)wrapper, PyUnicode_FromString(metaProp.name()));
     if (maybeProp && PythonQtProperty_Check(maybeProp)) {
       prop = (PythonQtProperty*)maybeProp;
     } else {

src/PythonQtBoolResult.cpp

@@ -55,7 +55,7 @@ static int PythonQtBoolResult_init(PythonQtBoolResultObject *self, PyObject* arg
 static PyObject *PythonQtBoolResult_repr(PythonQtBoolResultObject *obj)
 {
   PythonQtBoolResultObject* wrapper = (PythonQtBoolResultObject*)obj;
-  return PyString_FromString(wrapper->_value?"BoolResult(True)":"BoolResult(False)");
+  return PyUnicode_FromString(wrapper->_value?"BoolResult(True)":"BoolResult(False)");
 }
 
 static int PythonQtBoolResult_bool(PyObject *obj)

src/PythonQtClassWrapper.cpp

@@ -384,7 +384,7 @@ static int PythonQtClassWrapper_init(PythonQtClassWrapper* self, PyObject* args,
 
 static PyObject *PythonQtClassWrapper_classname(PythonQtClassWrapper* type)
 {
-  return PyString_FromString((QByteArray("Class_") + type->classInfo()->className()).constData());
+  return PyUnicode_FromString((QByteArray("Class_") + type->classInfo()->className()).constData());
 }
 
 static PyObject *PythonQtClassWrapper_help(PythonQtClassWrapper* type)
@@ -490,7 +490,7 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name)
     }
 
     if (wrapper->classInfo()->constructors()) {
-      PyObject* initName = PyString_FromString("__init__");
+      PyObject* initName = PyUnicode_FromString("__init__");
       PyObject* func = PyType_Type.tp_getattro(obj, initName);
       Py_DECREF(initName);
       PyDict_SetItemString(dict, "__init__", func);

src/PythonQtConversion.cpp

@@ -93,7 +93,7 @@ PyObject* PythonQtConv::ConvertQtValueToPython(const PythonQtMethodInfo::Paramet
     // a char ptr will probably be a null terminated string, so we support that:
     char* charPtr = *((char**)data);
     if (charPtr) {
-      return PyString_FromString(charPtr);
+      return PyUnicode_FromString(charPtr);
     } else {
       Py_RETURN_NONE;
     }
@@ -1297,7 +1297,7 @@ QVariant PythonQtConv::PyObjToQVariant(PyObject* val, int type)
 PyObject* PythonQtConv::QStringToPyObject(const QString& str)
 {
   if (str.isNull()) {
-    return PyString_FromString("");
+    return PyUnicode_FromString("");
   } else {
     return PyUnicode_DecodeUTF16((const char*)str.utf16(), str.length()*2, nullptr, nullptr);
   }

src/PythonQtInstanceWrapper.cpp

@@ -333,7 +333,7 @@ static PyObject *PythonQtInstanceWrapper_richcompare(PythonQtInstanceWrapper* wr
 
 static PyObject *PythonQtInstanceWrapper_classname(PythonQtInstanceWrapper* obj)
 {
-  return PyString_FromString(Py_TYPE(obj)->tp_name);
+  return PyUnicode_FromString(Py_TYPE(obj)->tp_name);
 }
 
 PyObject *PythonQtInstanceWrapper_inherits(PythonQtInstanceWrapper* obj, PyObject *args)

src/PythonQtSignal.cpp

@@ -123,9 +123,9 @@ static PyObject *
 meth_get__name__(PythonQtSignalFunctionObject *m, void * /*closure*/)
 {
   if (m->m_ml) {
-    return PyString_FromString(m->m_ml->signature());
+    return PyUnicode_FromString(m->m_ml->signature());
   } else {
-    return PyString_FromString("Signal");
+    return PyUnicode_FromString("Signal");
   }
 }
 
@@ -318,7 +318,7 @@ meth_repr(PythonQtSignalFunctionObject *f)
 {
   if (!f->m_ml) {
     // TODO
-    return PyString_FromString("Signal");
+    return PyUnicode_FromString("Signal");
   }
   if (f->m_self->ob_type == &PythonQtClassWrapper_Type) {
     PythonQtClassWrapper* self = (PythonQtClassWrapper*) f->m_self;

src/PythonQtSlot.cpp

@@ -579,13 +579,13 @@ meth_get__doc__(PythonQtSlotFunctionObject * m, void * /*closure*/)
   if (!pyReturnType.isEmpty()) {
     doc += " -> " + pyReturnType;
   }
-  return PyString_FromString(doc.constData());
+  return PyUnicode_FromString(doc.constData());
 }
 
 static PyObject *
 meth_get__name__(PythonQtSlotFunctionObject *m, void * /*closure*/)
 {
-  return PyString_FromString(m->m_ml->slotName(true));
+  return PyUnicode_FromString(m->m_ml->slotName(true));
 }
 
 static int
@@ -663,7 +663,7 @@ PyObject *PythonQtMemberFunction_parameterTypes(PythonQtSlotInfo* theInfo)
     QList<QByteArray> types = info->metaMethod()->parameterTypes();
     PyObject* tuple = PyTuple_New(types.count());
     for (int i = 0; i<types.count();i++) {
-      PyTuple_SET_ITEM(tuple, i, PyString_FromString(types.at(i).constData()));
+      PyTuple_SET_ITEM(tuple, i, PyUnicode_FromString(types.at(i).constData()));
     }
     info = info->nextInfo();
     PyTuple_SET_ITEM(result, j, tuple);
@@ -685,7 +685,7 @@ PyObject *PythonQtMemberFunction_parameterNames(PythonQtSlotInfo* theInfo)
     QList<QByteArray> names = info->metaMethod()->parameterNames();
     PyObject* tuple = PyTuple_New(names.count());
     for (int i = 0; i<names.count();i++) {
-      PyTuple_SET_ITEM(tuple, i, PyString_FromString(names.at(i).constData()));
+      PyTuple_SET_ITEM(tuple, i, PyUnicode_FromString(names.at(i).constData()));
     }
     info = info->nextInfo();
     PyTuple_SET_ITEM(result, j, tuple);
@@ -705,7 +705,7 @@ PyObject *PythonQtMemberFunction_typeName(PythonQtSlotInfo* theInfo)
   PyObject* result = PyTuple_New(count);
   for (int j = 0;j<count;j++) {
     QByteArray name = PythonQtUtils::typeName(*info->metaMethod());
-    PyTuple_SET_ITEM(result, j, PyString_FromString(name.constData()));
+    PyTuple_SET_ITEM(result, j, PyUnicode_FromString(name.constData()));
     info = info->nextInfo();
   }
   return result;

src/PythonQtSlotDecorator.cpp

@@ -96,7 +96,7 @@ PyObject* PythonQtSlotDecorator_call(PyObject* object, PyObject* args, PyObject*
     QByteArray returnType = QMetaObject::normalizedType(self->returnType->constData());
     QByteArray signature = returnType + " " + slotName + "(" + *self->args + ")";
 
-    static PyObject* qtSlots = PyString_FromString("_qtSlots");
+    static PyObject* qtSlots = PyUnicode_FromString("_qtSlots");
     PyObject* signatures = nullptr;
     if (!PyObject_HasAttr(function, qtSlots)) {
       // create a new list
@@ -109,7 +109,7 @@ PyObject* PythonQtSlotDecorator_call(PyObject* object, PyObject* args, PyObject*
     }
 
     // append the signature to the list
-    PyObject* pySignature = PyString_FromString(signature);
+    PyObject* pySignature = PyUnicode_FromString(signature);
     PyList_Append(signatures, pySignature);
     Py_DECREF(pySignature);