Avoid calling functions with an empty string as format string
Directly pass NULL rather than an empty string.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 07d59ca..be14560 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1784,7 +1784,7 @@
if (do_flush == -1)
return NULL;
else if (do_flush) {
- tmp = _PyObject_CallMethodId(file, &PyId_flush, "");
+ tmp = _PyObject_CallMethodId(file, &PyId_flush, NULL);
if (tmp == NULL)
return NULL;
else
@@ -1850,7 +1850,7 @@
}
/* First of all, flush stderr */
- tmp = _PyObject_CallMethodId(ferr, &PyId_flush, "");
+ tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
if (tmp == NULL)
PyErr_Clear();
else
@@ -1859,7 +1859,7 @@
/* We should only use (GNU) readline if Python's sys.stdin and
sys.stdout are the same as C's stdin and stdout, because we
need to pass it those. */
- tmp = _PyObject_CallMethodId(fin, &PyId_fileno, "");
+ tmp = _PyObject_CallMethodId(fin, &PyId_fileno, NULL);
if (tmp == NULL) {
PyErr_Clear();
tty = 0;
@@ -1872,7 +1872,7 @@
tty = fd == fileno(stdin) && isatty(fd);
}
if (tty) {
- tmp = _PyObject_CallMethodId(fout, &PyId_fileno, "");
+ tmp = _PyObject_CallMethodId(fout, &PyId_fileno, NULL);
if (tmp == NULL) {
PyErr_Clear();
tty = 0;
@@ -1907,7 +1907,7 @@
stdin_errors_str = _PyUnicode_AsString(stdin_errors);
if (!stdin_encoding_str || !stdin_errors_str)
goto _readline_errors;
- tmp = _PyObject_CallMethodId(fout, &PyId_flush, "");
+ tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL);
if (tmp == NULL)
PyErr_Clear();
else
@@ -1987,7 +1987,7 @@
if (PyFile_WriteObject(prompt, fout, Py_PRINT_RAW) != 0)
return NULL;
}
- tmp = _PyObject_CallMethodId(fout, &PyId_flush, "");
+ tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL);
if (tmp == NULL)
PyErr_Clear();
else
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 004feae..1896888 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -493,7 +493,7 @@
int status = 0;
if (fout != NULL && fout != Py_None && !file_is_closed(fout)) {
- tmp = _PyObject_CallMethodId(fout, &PyId_flush, "");
+ tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL);
if (tmp == NULL) {
PyErr_WriteUnraisable(fout);
status = -1;
@@ -503,7 +503,7 @@
}
if (ferr != NULL && ferr != Py_None && !file_is_closed(ferr)) {
- tmp = _PyObject_CallMethodId(ferr, &PyId_flush, "");
+ tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
if (tmp == NULL) {
PyErr_Clear();
status = -1;
@@ -1072,7 +1072,7 @@
text = PyUnicode_FromString(name);
if (text == NULL || _PyObject_SetAttrId(raw, &PyId_name, text) < 0)
goto error;
- res = _PyObject_CallMethodId(raw, &PyId_isatty, "");
+ res = _PyObject_CallMethodId(raw, &PyId_isatty, NULL);
if (res == NULL)
goto error;
isatty = PyObject_IsTrue(res);
@@ -1343,7 +1343,7 @@
Py_XDECREF(tb);
/* sys.stderr may be buffered: call sys.stderr.flush() */
- res = _PyObject_CallMethodId(ferr, &PyId_flush, "");
+ res = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
if (res == NULL)
PyErr_Clear();
else
@@ -1453,7 +1453,7 @@
PyErr_Clear();
return;
}
- result = _PyObject_CallMethodId(threading, &PyId__shutdown, "");
+ result = _PyObject_CallMethodId(threading, &PyId__shutdown, NULL);
if (result == NULL) {
PyErr_WriteUnraisable(threading);
}
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 3fb6f15..1fc86c0 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -950,7 +950,7 @@
f = _PySys_GetObjectId(&PyId_stderr);
if (f != NULL) {
- r = _PyObject_CallMethodId(f, &PyId_flush, "");
+ r = _PyObject_CallMethodId(f, &PyId_flush, NULL);
if (r)
Py_DECREF(r);
else
@@ -958,7 +958,7 @@
}
f = _PySys_GetObjectId(&PyId_stdout);
if (f != NULL) {
- r = _PyObject_CallMethodId(f, &PyId_flush, "");
+ r = _PyObject_CallMethodId(f, &PyId_flush, NULL);
if (r)
Py_DECREF(r);
else
diff --git a/Python/traceback.c b/Python/traceback.c
index b33156e..e8aac1b 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -314,7 +314,7 @@
if (fob == NULL) {
PyErr_Clear();
- res = _PyObject_CallMethodId(binary, &PyId_close, "");
+ res = _PyObject_CallMethodId(binary, &PyId_close, NULL);
Py_DECREF(binary);
if (res)
Py_DECREF(res);
@@ -334,7 +334,7 @@
break;
}
}
- res = _PyObject_CallMethodId(fob, &PyId_close, "");
+ res = _PyObject_CallMethodId(fob, &PyId_close, NULL);
if (res)
Py_DECREF(res);
else