From 0bb165ecc114fcf7ce1df454355c4cbbef8b63e9 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Sun, 31 Jan 2016 06:30:56 +0000 Subject: [PATCH] Issue #4806: Avoid masking TypeError when *-unpacking a generator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Based on patch by Hagen Fürstenau. --- Lib/test/test_extcall.py | 21 ++++++++++++++++----- Misc/NEWS | 4 ++++ Python/ceval.c | 6 ++++-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py index 80e09a0ec2..babcce9f9b 100644 --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -93,7 +93,7 @@ Verify clearing of SF bug #733667 >>> g(*Nothing()) Traceback (most recent call last): ... - TypeError: g() argument after * must be a sequence, not instance + TypeError: g() argument after * must be an iterable, not instance >>> class Nothing: ... def __len__(self): return 5 @@ -102,7 +102,7 @@ Verify clearing of SF bug #733667 >>> g(*Nothing()) Traceback (most recent call last): ... - TypeError: g() argument after * must be a sequence, not instance + TypeError: g() argument after * must be an iterable, not instance >>> class Nothing(): ... def __len__(self): return 5 @@ -128,6 +128,17 @@ Verify clearing of SF bug #733667 >>> g(*Nothing()) 0 (1, 2, 3) {} +Check for issue #4806: Does a TypeError in a generator get propagated with the +right error message? + + >>> def broken(): raise TypeError("myerror") + ... + + >>> g(*(broken() for i in range(1))) + Traceback (most recent call last): + ... + TypeError: myerror + Make sure that the function doesn't stomp the dictionary >>> d = {'a': 1, 'b': 2, 'c': 3} @@ -167,17 +178,17 @@ What about willful misconduct? >>> h(*h) Traceback (most recent call last): ... - TypeError: h() argument after * must be a sequence, not function + TypeError: h() argument after * must be an iterable, not function >>> dir(*h) Traceback (most recent call last): ... - TypeError: dir() argument after * must be a sequence, not function + TypeError: dir() argument after * must be an iterable, not function >>> None(*h) Traceback (most recent call last): ... - TypeError: NoneType object argument after * must be a sequence, \ + TypeError: NoneType object argument after * must be an iterable, \ not function >>> h(**h) diff --git a/Misc/NEWS b/Misc/NEWS index 6a80a280a0..f02087f932 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ What's New in Python 2.7.12? Core and Builtins ----------------- +- Issue #4806: Avoid masking the original TypeError exception when using star + (*) unpacking and the exception was raised from a generator. Based on + patch by Hagen Fürstenau. + - Issue #26659: Make the builtin slice type support cycle collection. - Issue #26718: super.__init__ no longer leaks memory if called multiple times. diff --git a/Python/ceval.c b/Python/ceval.c index 6e5e27280e..0b747d8281 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4615,10 +4615,12 @@ ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk) PyObject *t = NULL; t = PySequence_Tuple(stararg); if (t == NULL) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) { + if (PyErr_ExceptionMatches(PyExc_TypeError) && + /* Don't mask TypeError raised from a generator */ + !PyGen_Check(stararg)) { PyErr_Format(PyExc_TypeError, "%.200s%.200s argument after * " - "must be a sequence, not %200s", + "must be an iterable, not %200s", PyEval_GetFuncName(func), PyEval_GetFuncDesc(func), stararg->ob_type->tp_name); -- 2.50.1