mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-12 19:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-46852: Rename float.__set_format__() to float.__setformat__() (GH-31558) (GH-31578)

Browse source 
Rename the private undocumented float.__set_format__() method to
float.__setformat__() to fix a typo introduced in Python 3.7. The
method is only used by test_float.

The change enables again test_float tests on the float format which
were previously skipped because of the typo.

The typo was introduced in Python 3.7 by bpo-20185
in commit b5c51d3dd9.

(cherry picked from commit 7d03c8be5a)
This commit is contained in:
Victor Stinner 2022-02-25 15:47:07 +01:00 • committed by GitHub
parent 2b7e04d612
commit 0848da19ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS.d/next/Core and Builtins/2022-02-25-02-01-42.bpo-46852._3zg8D.rst Normal file
View file

@ -0,0 +1,3 @@
Rename the private undocumented ``float.__set_format__()`` method to
``float.__setformat__()`` to fix a typo introduced in Python 3.7. The method
is only used by test_float. Patch by Victor Stinner.

22
Objects/clinic/floatobject.c.h generated
View file

@ -289,8 +289,8 @@ exit:
return return_value; return return_value;
} }
PyDoc_STRVAR(float___set_format____doc__, PyDoc_STRVAR(float___setformat____doc__,
"__set_format__($type, typestr, fmt, /)\n" "__setformat__($type, typestr, fmt, /)\n"
"--\n" "--\n"
"\n" "\n"
"You probably don\'t want to use this function.\n" "You probably don\'t want to use this function.\n"
@ -307,25 +307,25 @@ PyDoc_STRVAR(float___set_format____doc__,
"Override the automatic determination of C-level floating point type.\n" "Override the automatic determination of C-level floating point type.\n"
"This affects how floats are converted to and from binary strings."); "This affects how floats are converted to and from binary strings.");
#define FLOAT___SET_FORMAT___METHODDEF \ #define FLOAT___SETFORMAT___METHODDEF \
{"__set_format__", (PyCFunction)(void(*)(void))float___set_format__, METH_FASTCALL|METH_CLASS, float___set_format____doc__}, {"__setformat__", (PyCFunction)(void(*)(void))float___setformat__, METH_FASTCALL|METH_CLASS, float___setformat____doc__},
static PyObject * static PyObject *
float___set_format___impl(PyTypeObject *type, const char *typestr, float___setformat___impl(PyTypeObject *type, const char *typestr,
const char *fmt); const char *fmt);
static PyObject * static PyObject *
float___set_format__(PyTypeObject *type, PyObject *const *args, Py_ssize_t nargs) float___setformat__(PyTypeObject *type, PyObject *const *args, Py_ssize_t nargs)
{ {
PyObject *return_value = NULL; PyObject *return_value = NULL;
const char *typestr; const char *typestr;
const char *fmt; const char *fmt;
if (!_PyArg_CheckPositional("__set_format__", nargs, 2, 2)) { if (!_PyArg_CheckPositional("__setformat__", nargs, 2, 2)) {
goto exit; goto exit;
} }
if (!PyUnicode_Check(args[0])) { if (!PyUnicode_Check(args[0])) {
_PyArg_BadArgument("__set_format__", "argument 1", "str", args[0]); _PyArg_BadArgument("__setformat__", "argument 1", "str", args[0]);
goto exit; goto exit;
} }
Py_ssize_t typestr_length; Py_ssize_t typestr_length;
@ -338,7 +338,7 @@ float___set_format__(PyTypeObject *type, PyObject *const *args, Py_ssize_t nargs
goto exit; goto exit;
} }
if (!PyUnicode_Check(args[1])) { if (!PyUnicode_Check(args[1])) {
_PyArg_BadArgument("__set_format__", "argument 2", "str", args[1]); _PyArg_BadArgument("__setformat__", "argument 2", "str", args[1]);
goto exit; goto exit;
} }
Py_ssize_t fmt_length; Py_ssize_t fmt_length;
@ -350,7 +350,7 @@ float___set_format__(PyTypeObject *type, PyObject *const *args, Py_ssize_t nargs
PyErr_SetString(PyExc_ValueError, "embedded null character"); PyErr_SetString(PyExc_ValueError, "embedded null character");
goto exit; goto exit;
} }
return_value = float___set_format___impl(type, typestr, fmt); return_value = float___setformat___impl(type, typestr, fmt);
exit: exit:
return return_value; return return_value;
@ -387,4 +387,4 @@ float___format__(PyObject *self, PyObject *arg)
exit: exit:
return return_value; return return_value;
} }
/*[clinic end generated code: output=bb079c3e130e4ce6 input=a9049054013a1b77]*/ /*[clinic end generated code: output=f4aae29054273cb5 input=a9049054013a1b77]*/

8
Objects/floatobject.c
View file

@ -1748,7 +1748,7 @@ float___getformat___impl(PyTypeObject *type, const char *typestr)
/*[clinic input] /*[clinic input]
@classmethod @classmethod
float.__set_format__ float.__setformat__
typestr: str typestr: str
Must be 'double' or 'float'. Must be 'double' or 'float'.
@ -1767,9 +1767,9 @@ This affects how floats are converted to and from binary strings.
[clinic start generated code]*/ [clinic start generated code]*/
static PyObject * static PyObject *
float___set_format___impl(PyTypeObject *type, const char *typestr, float___setformat___impl(PyTypeObject *type, const char *typestr,
const char *fmt) const char *fmt)
/*[clinic end generated code: output=504460f5dc85acbd input=5306fa2b81a997e4]*/ /*[clinic end generated code: output=06864de1fb5f1f04 input=c0e9e04dd87f9988]*/
{ {
float_format_type f; float_format_type f;
float_format_type detected; float_format_type detected;
@ -1871,7 +1871,7 @@ static PyMethodDef float_methods[] = {
FLOAT_IS_INTEGER_METHODDEF FLOAT_IS_INTEGER_METHODDEF
FLOAT___GETNEWARGS___METHODDEF FLOAT___GETNEWARGS___METHODDEF
FLOAT___GETFORMAT___METHODDEF FLOAT___GETFORMAT___METHODDEF
FLOAT___SET_FORMAT___METHODDEF FLOAT___SETFORMAT___METHODDEF
FLOAT___FORMAT___METHODDEF FLOAT___FORMAT___METHODDEF
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };