diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-12-26 10:30:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-26 10:30:41 (GMT) |
| commit | 13a6c098c215921e35004f9d3a9b70f601e56500 (patch) | |
| tree | cda014f1d730c1b10abc45484b9e2cf7ea04aa33 | |
| parent | a8f4e15f3d33084862ddd3a7d58cd00034e94f16 (diff) | |
| download | cpython-13a6c098c215921e35004f9d3a9b70f601e56500.zip cpython-13a6c098c215921e35004f9d3a9b70f601e56500.tar.gz cpython-13a6c098c215921e35004f9d3a9b70f601e56500.tar.bz2 | |
bpo-32259: Make a TypeError message when unpack non-iterable more specific. (#4903)
| -rwxr-xr-x | Lib/test/test_dataclasses.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_unpack.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_unpack_ex.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2017-12-16-14-30-21.bpo-32259.GoOJiX.rst | 2 | ||||
| -rw-r--r-- | Python/ceval.c | 12 |
5 files changed, 16 insertions, 6 deletions
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py index 18ca202..7fbea76 100755 --- a/Lib/test/test_dataclasses.py +++ b/Lib/test/test_dataclasses.py @@ -866,7 +866,7 @@ class TestCase(unittest.TestCase): self.assertNotEqual(Point3D(1, 2, 3), (1, 2, 3)) # Make sure we can't unpack - with self.assertRaisesRegex(TypeError, 'is not iterable'): + with self.assertRaisesRegex(TypeError, 'unpack'): x, y, z = Point3D(4, 5, 6) # Maka sure another class with the same field names isn't diff --git a/Lib/test/test_unpack.py b/Lib/test/test_unpack.py index 3fcb18f..1c0c523 100644 --- a/Lib/test/test_unpack.py +++ b/Lib/test/test_unpack.py @@ -55,7 +55,7 @@ Unpacking non-sequence >>> a, b, c = 7 Traceback (most recent call last): ... - TypeError: 'int' object is not iterable + TypeError: cannot unpack non-iterable int object Unpacking tuple of wrong size @@ -129,7 +129,7 @@ Unpacking non-iterables should raise TypeError >>> () = 42 Traceback (most recent call last): ... - TypeError: 'int' object is not iterable + TypeError: cannot unpack non-iterable int object Unpacking to an empty iterable should raise ValueError diff --git a/Lib/test/test_unpack_ex.py b/Lib/test/test_unpack_ex.py index 6be8f55..45cf051 100644 --- a/Lib/test/test_unpack_ex.py +++ b/Lib/test/test_unpack_ex.py @@ -263,7 +263,7 @@ Unpacking non-sequence >>> a, *b = 7 Traceback (most recent call last): ... - TypeError: 'int' object is not iterable + TypeError: cannot unpack non-iterable int object Unpacking sequence too short diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-12-16-14-30-21.bpo-32259.GoOJiX.rst b/Misc/NEWS.d/next/Core and Builtins/2017-12-16-14-30-21.bpo-32259.GoOJiX.rst new file mode 100644 index 0000000..1129c75 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-12-16-14-30-21.bpo-32259.GoOJiX.rst @@ -0,0 +1,2 @@ +The error message of a TypeError raised when unpack non-iterable is now more +specific. diff --git a/Python/ceval.c b/Python/ceval.c index 287f1df..9276755 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4137,8 +4137,16 @@ unpack_iterable(PyObject *v, int argcnt, int argcntafter, PyObject **sp) assert(v != NULL); it = PyObject_GetIter(v); - if (it == NULL) - goto Error; + if (it == NULL) { + if (PyErr_ExceptionMatches(PyExc_TypeError) && + v->ob_type->tp_iter == NULL && !PySequence_Check(v)) + { + PyErr_Format(PyExc_TypeError, + "cannot unpack non-iterable %.200s object", + v->ob_type->tp_name); + } + return 0; + } for (; i < argcnt; i++) { w = PyIter_Next(it); |