From a8702bb8c8487e500e5cfcf47759fa739489f122 Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Sun, 8 Jan 2023 01:23:34 -0800 Subject: [PATCH] [3.10] gh-100776: Fix misleading default value in help(input) (GH-100788) (#100842) (cherry picked from commit a2141882f259e21bb09fa0b7cba8142147b9e3d7) Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com> --- .../2023-01-06-02-02-11.gh-issue-100776.pP8xux.rst | 1 + Python/bltinmodule.c | 4 ++-- Python/clinic/bltinmodule.c.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-01-06-02-02-11.gh-issue-100776.pP8xux.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-01-06-02-02-11.gh-issue-100776.pP8xux.rst b/Misc/NEWS.d/next/Core and Builtins/2023-01-06-02-02-11.gh-issue-100776.pP8xux.rst new file mode 100644 index 00000000000000..b94121ea5f2972 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2023-01-06-02-02-11.gh-issue-100776.pP8xux.rst @@ -0,0 +1 @@ +Fix misleading default value in :func:`input`'s ``__text_signature__``. diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index b0162e5e87217a..659b78edc3de43 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2034,7 +2034,7 @@ flush: whether to forcibly flush the stream."); /*[clinic input] input as builtin_input - prompt: object(c_default="NULL") = None + prompt: object(c_default="NULL") = "" / Read a string from standard input. The trailing newline is stripped. @@ -2048,7 +2048,7 @@ On *nix systems, readline is used if available. static PyObject * builtin_input_impl(PyObject *module, PyObject *prompt) -/*[clinic end generated code: output=83db5a191e7a0d60 input=5e8bb70c2908fe3c]*/ +/*[clinic end generated code: output=83db5a191e7a0d60 input=159c46d4ae40977e]*/ { PyObject *fin = _PySys_GetObjectId(&PyId_stdin); PyObject *fout = _PySys_GetObjectId(&PyId_stdout); diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h index 545f5b53f6e549..6f547921c7e949 100644 --- a/Python/clinic/bltinmodule.c.h +++ b/Python/clinic/bltinmodule.c.h @@ -672,7 +672,7 @@ builtin_pow(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject } PyDoc_STRVAR(builtin_input__doc__, -"input($module, prompt=None, /)\n" +"input($module, prompt=\'\', /)\n" "--\n" "\n" "Read a string from standard input. The trailing newline is stripped.\n" @@ -874,4 +874,4 @@ builtin_issubclass(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=da9ae459e9233259 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b5c1a7a1621b7cca input=a9049054013a1b77]*/