diff options
| author |   Serhiy Storchaka <storchaka@gmail.com> | 2017-03-06 17:01:06 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-03-06 17:01:06 +0200 |
| commit | 2e5642422f6234fd8d0c082142b27340e588f96e (patch) | |
| tree | 8279099d6fc0b034aaeb0be40a1d30d9246afc81 /Objects/floatobject.c | |
| parent | bpo-29714: Fix a regression that bytes format may fail when containing zero ... (diff) | |
| download | cpython-2e5642422f6234fd8d0c082142b27340e588f96e.tar.gz cpython-2e5642422f6234fd8d0c082142b27340e588f96e.tar.bz2 cpython-2e5642422f6234fd8d0c082142b27340e588f96e.zip | |
bpo-29695: Remove bad keyword parameters in int(), bool(), float(), list() and tuple(). (#518)
Diffstat (limited to 'Objects/floatobject.c')
| -rw-r--r-- | Objects/floatobject.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 3a881c3358b..9267b9f27bf 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1563,18 +1563,13 @@ static PyObject * float_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { PyObject *x = Py_False; /* Integer zero */ - static char *kwlist[] = {"x", 0}; if (type != &PyFloat_Type) return float_subtype_new(type, args, kwds); /* Wimp out */ - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x)) + if (!_PyArg_NoKeywords("float()", kwds)) + return NULL; + if (!PyArg_UnpackTuple(args, "float", 0, 1, &x)) return NULL; - if (kwds != NULL && PyDict_GET_SIZE(kwds) != 0) { - if (PyErr_Warn(PyExc_DeprecationWarning, - "Using 'x' as a keyword argument is deprecated; " - "specify the value as a positional argument instead") < 0) - return NULL; - } /* If it's a string, but not a string subclass, use PyFloat_FromString. */ if (PyUnicode_CheckExact(x)) |