Simplify trivial calls of PyUnicode_FromFormat() (GH-111605)

serhiy-storchaka · web-flow · commit 5d6db168b9cd · 2023-11-01T19:54:32.000+02:00
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -307,7 +307,7 @@ _sharedexception_bind(PyObject *exc, int code, _sharedexception *sharedexc)
     }
 
     if (exc != NULL) {
-        PyObject *msgobj = PyUnicode_FromFormat("%S", exc);
+        PyObject *msgobj = PyObject_Str(exc);
         if (msgobj == NULL) {
             failure = "unable to format exception message";
             code = ERR_NO_MEMORY;
diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c
@@ -420,7 +420,7 @@ zoneinfo_ZoneInfo_from_file_impl(PyTypeObject *type, PyTypeObject *cls,
         return NULL;
     }
 
-    file_repr = PyUnicode_FromFormat("%R", file_obj);
+    file_repr = PyObject_Repr(file_obj);
     if (file_repr == NULL) {
         goto error;
     }

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ _sharedexception_bind(PyObject exc, int code, _sharedexception sharedexc)`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`if (exc != NULL) {`
`310`		`- PyObject *msgobj = PyUnicode_FromFormat("%S", exc);`
	`310`	`+ PyObject *msgobj = PyObject_Str(exc);`
`311`	`311`	`if (msgobj == NULL) {`
`312`	`312`	`failure = "unable to format exception message";`
`313`	`313`	`code = ERR_NO_MEMORY;`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ zoneinfo_ZoneInfo_from_file_impl(PyTypeObject type, PyTypeObject cls,`
`420`	`420`	`return NULL;`
`421`	`421`	`}`
`422`	`422`
`423`		`- file_repr = PyUnicode_FromFormat("%R", file_obj);`
	`423`	`+ file_repr = PyObject_Repr(file_obj);`
`424`	`424`	`if (file_repr == NULL) {`
`425`	`425`	`goto error;`
`426`	`426`	`}`