Skip to content

bpo-29695: Deprecated using bad named keyword arguments in builtings: #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Doc/whatsnew/3.7.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ Deprecated
both deprecated in Python 3.4 now emit :exc:`DeprecationWarning`. (Contributed
by Matthias Bussonnier in :issue:`29576`)

- Using *x* as a keyword argument in :func:`int`, :func:`bool` and
:func:`float` and using *sequence* as a keyword argument in :func:`list`
and :func:`tuple` are deprecated. Specify the value as a positional argument
instead. (Contributed by Serhiy Storchaka in :issue:`29695`.)


Removed
=======
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/test_bool.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ def test_convert(self):
self.assertIs(bool(""), False)
self.assertIs(bool(), False)

def test_keyword_args(self):
with self.assertWarns(DeprecationWarning):
self.assertIs(bool(x=10), True)

def test_format(self):
self.assertEqual("%d" % False, "0")
self.assertEqual("%d" % True, "1")
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/test_float.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ def __float__(self):
with self.assertWarns(DeprecationWarning):
self.assertIs(type(FloatSubclass(F())), FloatSubclass)

def test_keyword_args(self):
with self.assertWarns(DeprecationWarning):
self.assertEqual(float(x='3.14'), 3.14)

def test_is_integer(self):
self.assertFalse((1.1).is_integer())
self.assertTrue((1.).is_integer())
Expand Down
6 changes: 4 additions & 2 deletions Lib/test/test_int.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,11 @@ def test_no_args(self):

def test_keyword_args(self):
# Test invoking int() using keyword arguments.
self.assertEqual(int(x=1.2), 1)
with self.assertWarns(DeprecationWarning):
self.assertEqual(int(x=1.2), 1)
self.assertEqual(int('100', base=2), 4)
self.assertEqual(int(x='100', base=2), 4)
with self.assertWarns(DeprecationWarning):
self.assertEqual(int(x='100', base=2), 4)
self.assertRaises(TypeError, int, base=10)
self.assertRaises(TypeError, int, base=0)

Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ def test_basic(self):
self.assertEqual(list((0, 1, 2, 3)), [0, 1, 2, 3])
self.assertEqual(list(''), [])
self.assertEqual(list('spam'), ['s', 'p', 'a', 'm'])
self.assertEqual(list(x for x in range(10) if x % 2),
[1, 3, 5, 7, 9])

if sys.maxsize == 0x7fffffff:
# This test can currently only work on 32-bit machines.
Expand All @@ -39,6 +41,11 @@ def test_basic(self):
x.extend(-y for y in x)
self.assertEqual(x, [])

def test_keyword_args(self):
with self.assertWarns(DeprecationWarning):
self.assertEqual(list(sequence=(x for x in range(10) if x % 2)),
[1, 3, 5, 7, 9])

def test_truth(self):
super().test_truth()
self.assertTrue(not [])
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_tuple.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ def test_constructors(self):
self.assertEqual(tuple([0, 1, 2, 3]), (0, 1, 2, 3))
self.assertEqual(tuple(''), ())
self.assertEqual(tuple('spam'), ('s', 'p', 'a', 'm'))
self.assertEqual(tuple(x for x in range(10) if x % 2),
(1, 3, 5, 7, 9))

def test_keyword_args(self):
with self.assertWarns(DeprecationWarning):
self.assertEqual(tuple(sequence=(x for x in range(10) if x % 2)),
(1, 3, 5, 7, 9))

def test_truth(self):
super().test_truth()
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ What's New in Python 3.7.0 alpha 1?
Core and Builtins
-----------------

- bpo-29695: Using "x" as a keyword argument in int(), bool() and float() and
using "sequence" as a keyword argument in list() and tuple() are deprecated.
Specify the value as a positional argument instead.

- bpo-28893: Set correct __cause__ for errors about invalid awaitables
returned from __aiter__ and __anext__.

Expand Down
6 changes: 6 additions & 0 deletions Objects/boolobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ bool_new(PyTypeObject *type, PyObject *args, PyObject *kwds)

if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:bool", kwlist, &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;
}
ok = PyObject_IsTrue(x);
if (ok < 0)
return NULL;
Expand Down
6 changes: 6 additions & 0 deletions Objects/floatobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,12 @@ float_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return float_subtype_new(type, args, kwds); /* Wimp out */
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &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))
Expand Down
6 changes: 6 additions & 0 deletions Objects/listobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -2297,6 +2297,12 @@ list_init(PyListObject *self, PyObject *args, PyObject *kw)

if (!PyArg_ParseTupleAndKeywords(args, kw, "|O:list", kwlist, &arg))
return -1;
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 -1;
}

/* Verify list invariants established by PyType_GenericAlloc() */
assert(0 <= Py_SIZE(self));
Expand Down
6 changes: 6 additions & 0 deletions Objects/longobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -4811,6 +4811,12 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
return PyLong_FromLong(0L);
}
if (PyTuple_GET_SIZE(args) == 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 (obase == NULL)
return PyNumber_Long(x);

Expand Down
6 changes: 6 additions & 0 deletions Objects/tupleobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,12 @@ tuple_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return tuple_subtype_new(type, args, kwds);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:tuple", kwlist, &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);
Expand Down