Issue #28086: Single var-positional argument of tuple subtype was passed

unscathed to the C-defined function.  Now it is converted to exact tuple.
This commit is contained in:
Serhiy Storchaka 2016-09-22 19:41:20 +03:00
parent 5ed548715a
commit 63dc548109
3 changed files with 6 additions and 3 deletions

View File

@ -471,7 +471,7 @@ class Tuple_TestCase(unittest.TestCase):
ret = get_args(*TupleSubclass([1, 2]))
self.assertEqual(ret, (1, 2))
self.assertIsInstance(ret, tuple)
self.assertIs(type(ret), tuple)
ret = get_args()
self.assertIn(ret, ((), None))

View File

@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 2
Core and Builtins
-----------------
- Issue #28086: Single var-positional argument of tuple subtype was passed
unscathed to the C-defined function. Now it is converted to exact tuple.
- Issue #28214: Now __set_name__ is looked up on the class instead of the
instance.

View File

@ -3310,7 +3310,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
}
callargs = POP();
func = TOP();
if (!PyTuple_Check(callargs)) {
if (!PyTuple_CheckExact(callargs)) {
if (Py_TYPE(callargs)->tp_iter == NULL &&
!PySequence_Check(callargs)) {
PyErr_Format(PyExc_TypeError,
@ -3327,7 +3327,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
goto error;
}
}
assert(PyTuple_Check(callargs));
assert(PyTuple_CheckExact(callargs));
result = do_call_core(func, callargs, kwargs);
Py_DECREF(func);