commit 13a6c098c215921e35004f9d3a9b70f601e56500
author Serhiy Storchaka <storchaka@gmail.com> Tue Dec 26 12:30:41 2017 +0200
committer GitHub <noreply@github.com> Tue Dec 26 12:30:41 2017 +0200
tree cda014f1d730c1b10abc45484b9e2cf7ea04aa33
parent a8f4e15f3d33084862ddd3a7d58cd00034e94f16

bpo-32259: Make a TypeError message when unpack non-iterable more specific. (#4903)

Python/ceval.c

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 @@
     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);