summaryrefslogtreecommitdiffstats
path: root/Objects/tupleobject.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-03-06 15:01:06 (GMT)
committerGitHub <noreply@github.com>2017-03-06 15:01:06 (GMT)
commit2e5642422f6234fd8d0c082142b27340e588f96e (patch)
tree8279099d6fc0b034aaeb0be40a1d30d9246afc81 /Objects/tupleobject.c
parentb76ad5121e2cfa89d6476d700cbcb65b7ffc39ac (diff)
downloadcpython-2e5642422f6234fd8d0c082142b27340e588f96e.zip
cpython-2e5642422f6234fd8d0c082142b27340e588f96e.tar.gz
cpython-2e5642422f6234fd8d0c082142b27340e588f96e.tar.bz2
bpo-29695: Remove bad keyword parameters in int(), bool(), float(), list() and tuple(). (#518)
Diffstat (limited to 'Objects/tupleobject.c')
-rw-r--r--Objects/tupleobject.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index c2696c7..64db806 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -648,18 +648,13 @@ static PyObject *
tuple_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *arg = NULL;
- static char *kwlist[] = {"sequence", 0};
if (type != &PyTuple_Type)
return tuple_subtype_new(type, args, kwds);
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:tuple", kwlist, &arg))
+ if (!_PyArg_NoKeywords("tuple()", kwds))
+ return NULL;
+ if (!PyArg_UnpackTuple(args, "tuple", 0, 1, &arg))
return NULL;
- if (arg != NULL && PyTuple_GET_SIZE(args) == 0) {
- if (PyErr_Warn(PyExc_DeprecationWarning,
- "Using 'sequence' as a keyword argument is deprecated; "
- "specify the value as a positional argument instead") < 0)
- return NULL;
- }
if (arg == NULL)
return PyTuple_New(0);