diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-09-11 06:26:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 06:26:15 (GMT) |
| commit | c67838da2cde6fa3f1bef11f08719237983e6990 (patch) | |
| tree | 7c92073d569da4ae9eb3527a61babbdbfe9baecd /Python | |
| parent | 4a8b53a2083506ee13ff2eba2c14264f5a7faa91 (diff) | |
| download | cpython-c67838da2cde6fa3f1bef11f08719237983e6990.zip cpython-c67838da2cde6fa3f1bef11f08719237983e6990.tar.gz cpython-c67838da2cde6fa3f1bef11f08719237983e6990.tar.bz2 | |
[3.6] bpo-29526: Add reference to help('FORMATTING') in format() builtin (GH-166). (#3491)
(cherry picked from commit 2e6bb4484ee1b0da67d1dfcf0816c58602daa5a0)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bltinmodule.c | 6 | ||||
| -rw-r--r-- | Python/clinic/bltinmodule.c.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 597e26e..911e2ba 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -588,12 +588,14 @@ format as builtin_format Return value.__format__(format_spec) -format_spec defaults to the empty string +format_spec defaults to the empty string. +See the Format Specification Mini-Language section of help('FORMATTING') for +details. [clinic start generated code]*/ static PyObject * builtin_format_impl(PyObject *module, PyObject *value, PyObject *format_spec) -/*[clinic end generated code: output=2f40bdfa4954b077 input=6325e751a1b29b86]*/ +/*[clinic end generated code: output=2f40bdfa4954b077 input=88339c93ea522b33]*/ { return PyObject_Format(value, format_spec); } diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h index c88deef..37ce794 100644 --- a/Python/clinic/bltinmodule.c.h +++ b/Python/clinic/bltinmodule.c.h @@ -77,7 +77,9 @@ PyDoc_STRVAR(builtin_format__doc__, "\n" "Return value.__format__(format_spec)\n" "\n" -"format_spec defaults to the empty string"); +"format_spec defaults to the empty string.\n" +"See the Format Specification Mini-Language section of help(\'FORMATTING\') for\n" +"details."); #define BUILTIN_FORMAT_METHODDEF \ {"format", (PyCFunction)builtin_format, METH_VARARGS, builtin_format__doc__}, @@ -674,4 +676,4 @@ builtin_issubclass(PyObject *module, PyObject *args) exit: return return_value; } -/*[clinic end generated code: output=63483deb75805f7c input=a9049054013a1b77]*/ +/*[clinic end generated code: output=2ef82846acdfa0f5 input=a9049054013a1b77]*/ |