chore(PythonQt): replace PyString_FromFormat with PyUnicode_FromFormat

Format string creation now uses the Unicode API directly.
No functional change intended.

Author: jcfr

src/PythonQtClassWrapper.cpp

@@ -582,12 +582,12 @@ static PyObject * PythonQtClassWrapper_repr(PyObject * obj)
       }
     }
     if (meta) {
-      return PyString_FromFormat("%s Class (C++ wrapped by %s)", wrapper->classInfo()->className(), meta->className());
+      return PyUnicode_FromFormat("%s Class (C++ wrapped by %s)", wrapper->classInfo()->className(), meta->className());
     } else {
-      return PyString_FromFormat("%s Class (C++ unwrapped)", wrapper->classInfo()->className());
+      return PyUnicode_FromFormat("%s Class (C++ unwrapped)", wrapper->classInfo()->className());
     }
   } else {
-    return PyString_FromFormat("%s Class", wrapper->classInfo()->className());
+    return PyUnicode_FromFormat("%s Class", wrapper->classInfo()->className());
   }
 }
 

src/PythonQtImporter.cpp

@@ -299,7 +299,7 @@ PythonQtImporter_load_module(PyObject *obj, PyObject *args)
       QString subname = info.moduleName;
       int err;
 
-      fullpath = PyString_FromFormat("%s%c%s",
+      fullpath = PyUnicode_FromFormat("%s%c%s",
                                      QStringToPythonConstCharPointer(*self->_path),
                                      SEP,
                                      QStringToPythonConstCharPointer(subname));

src/PythonQtInstanceWrapper.cpp

@@ -804,16 +804,16 @@ static PyObject * PythonQtInstanceWrapper_str(PyObject * obj)
   QObject *qobj = wrapper->_obj;
   QString str = getStringFromObject(wrapper);
   if (!str.isEmpty()) {
-    return PyString_FromFormat("%s", QStringToPythonConstCharPointer(str));
+    return PyUnicode_FromFormat("%s", QStringToPythonConstCharPointer(str));
   }
   if (wrapper->_wrappedPtr) {
     if (wrapper->_obj) {
-      return PyString_FromFormat("%s (C++ Object %p wrapped by %s %p))", typeName, wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
+      return PyUnicode_FromFormat("%s (C++ Object %p wrapped by %s %p))", typeName, wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
     } else {
-      return PyString_FromFormat("%s (C++ Object %p)", typeName, wrapper->_wrappedPtr);
+      return PyUnicode_FromFormat("%s (C++ Object %p)", typeName, wrapper->_wrappedPtr);
     }
   } else {
-    return PyString_FromFormat("%s (QObject %p)", typeName, qobj);
+    return PyUnicode_FromFormat("%s (QObject %p)", typeName, qobj);
   }
 }
 
@@ -829,19 +829,19 @@ static PyObject * PythonQtInstanceWrapper_repr(PyObject * obj)
   QString str = getStringFromObject(wrapper);
   if (!str.isEmpty()) {
     if (str.startsWith(typeName)) {
-      return PyString_FromFormat("%s", QStringToPythonConstCharPointer(str));
+      return PyUnicode_FromFormat("%s", QStringToPythonConstCharPointer(str));
     } else {
-      return PyString_FromFormat("%s (%s, at: %p)", typeName, QStringToPythonConstCharPointer(str), wrapper->_wrappedPtr ? wrapper->_wrappedPtr : qobj);
+      return PyUnicode_FromFormat("%s (%s, at: %p)", typeName, QStringToPythonConstCharPointer(str), wrapper->_wrappedPtr ? wrapper->_wrappedPtr : qobj);
     }
   }
   if (wrapper->_wrappedPtr) {
     if (wrapper->_obj) {
-      return PyString_FromFormat("%s (C++ object at: %p wrapped by %s at: %p)", typeName, wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
+      return PyUnicode_FromFormat("%s (C++ object at: %p wrapped by %s at: %p)", typeName, wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
     } else {
-      return PyString_FromFormat("%s (C++ object at: %p)", typeName, wrapper->_wrappedPtr);
+      return PyUnicode_FromFormat("%s (C++ object at: %p)", typeName, wrapper->_wrappedPtr);
     }
   } else {
-    return PyString_FromFormat("%s (%s at: %p)", typeName, wrapper->classInfo()->className().constData(), qobj);
+    return PyUnicode_FromFormat("%s (%s at: %p)", typeName, wrapper->classInfo()->className().constData(), qobj);
   }
 }
 

src/PythonQtPythonInclude.h

@@ -121,7 +121,6 @@
 #define PY3K
 // Helper defines to facilitate porting
 #define PyString_FromString PyUnicode_FromString
-#define PyString_FromFormat PyUnicode_FromFormat
 #define PyString_Check      PyUnicode_Check
 
 #else

src/PythonQtSignal.cpp

@@ -322,11 +322,11 @@ meth_repr(PythonQtSignalFunctionObject *f)
   }
   if (f->m_self->ob_type == &PythonQtClassWrapper_Type) {
     PythonQtClassWrapper* self = (PythonQtClassWrapper*) f->m_self;
-    return PyString_FromFormat("<unbound qt signal %s of %s type>",
+    return PyUnicode_FromFormat("<unbound qt signal %s of %s type>",
       f->m_ml->slotName().constData(),
       self->classInfo()->className().constData());
   } else {
-    return PyString_FromFormat("<qt signal %s of %s instance at %p>",
+    return PyUnicode_FromFormat("<qt signal %s of %s instance at %p>",
       f->m_ml->slotName().constData(),
       f->m_self->ob_type->tp_name,
       f->m_self);

src/PythonQtSlot.cpp

@@ -729,11 +729,11 @@ meth_repr(PythonQtSlotFunctionObject *f)
 {
   if (f->m_self->ob_type == &PythonQtClassWrapper_Type) {
     PythonQtClassWrapper* self = (PythonQtClassWrapper*) f->m_self;
-    return PyString_FromFormat("<unbound qt slot %s of %s type>",
+    return PyUnicode_FromFormat("<unbound qt slot %s of %s type>",
       f->m_ml->slotName().constData(),
       self->classInfo()->className().constData());
   } else {
-    return PyString_FromFormat("<qt slot %s of %s instance at %p>",
+    return PyUnicode_FromFormat("<qt slot %s of %s instance at %p>",
       f->m_ml->slotName().constData(),
       f->m_self->ob_type->tp_name,
       f->m_self);