mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00
Issue #26057: Got rid of nonneeded use of PyUnicode_FromObject().
This commit is contained in:
parent
131b8f8eee
commit
21a663ea28
6 changed files with 240 additions and 641 deletions
|
@ -1931,9 +1931,8 @@ builtin_input_impl(PyModuleDef *module, PyObject *prompt)
|
|||
Py_CLEAR(stringpo);
|
||||
if (po == NULL)
|
||||
goto _readline_errors;
|
||||
promptstr = PyBytes_AsString(po);
|
||||
if (promptstr == NULL)
|
||||
goto _readline_errors;
|
||||
assert(PyBytes_Check(po));
|
||||
promptstr = PyBytes_AS_STRING(po);
|
||||
}
|
||||
else {
|
||||
po = NULL;
|
||||
|
|
|
@ -1056,35 +1056,25 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
|
|||
return converterr("(AsCharBuffer failed)",
|
||||
arg, msgbuf, bufsize);
|
||||
}
|
||||
else {
|
||||
PyObject *u;
|
||||
|
||||
/* Convert object to Unicode */
|
||||
u = PyUnicode_FromObject(arg);
|
||||
if (u == NULL)
|
||||
return converterr(
|
||||
"string or unicode or text buffer",
|
||||
arg, msgbuf, bufsize);
|
||||
|
||||
else if (PyUnicode_Check(arg)) {
|
||||
/* Encode object; use default error handling */
|
||||
s = PyUnicode_AsEncodedString(u,
|
||||
s = PyUnicode_AsEncodedString(arg,
|
||||
encoding,
|
||||
NULL);
|
||||
Py_DECREF(u);
|
||||
if (s == NULL)
|
||||
return converterr("(encoding failed)",
|
||||
arg, msgbuf, bufsize);
|
||||
if (!PyBytes_Check(s)) {
|
||||
Py_DECREF(s);
|
||||
return converterr(
|
||||
"(encoder failed to return bytes)",
|
||||
arg, msgbuf, bufsize);
|
||||
}
|
||||
assert(PyBytes_Check(s));
|
||||
size = PyBytes_GET_SIZE(s);
|
||||
ptr = PyBytes_AS_STRING(s);
|
||||
if (ptr == NULL)
|
||||
ptr = "";
|
||||
}
|
||||
else {
|
||||
return converterr(
|
||||
recode_strings ? "str" : "str, bytes or bytearray",
|
||||
arg, msgbuf, bufsize);
|
||||
}
|
||||
|
||||
/* Write output; output is guaranteed to be 0-terminated */
|
||||
if (*format == '#') {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue