SF bug [#466173] unpack TypeError unclear

Replaced 3 instances of "iter() of non-sequence" with
"iteration over non-sequence".
Restored "unpack non-sequence" for stuff like "a, b = 1".

diff --git a/Objects/abstract.c b/Objects/abstract.c
index ac951238f35044d40cc3da712195c1c745c48807..7a5305ad892dbb5c58483db370e6c102cac0b6f1 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1859,7 +1859,7 @@ PyObject_GetIter(PyObject *o)
        if (f == NULL) {
                if (PySequence_Check(o))
                        return PySeqIter_New(o);
-               PyErr_SetString(PyExc_TypeError, "iter() of non-sequence");
+               PyErr_SetString(PyExc_TypeError, "iteration over non-sequence");
                return NULL;
        }
        else {

diff --git a/Objects/classobject.c b/Objects/classobject.c
index df10aa20ee573c7be42ae1e7848567850c58f1ec..cef1894737e6f4ee2415d72fac14a60fd1dcdde2 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -1839,7 +1839,7 @@ instance_getiter(PyInstanceObject *self)
        }
        PyErr_Clear();
        if ((func = instance_getattr(self, getitemstr)) == NULL) {
-               PyErr_SetString(PyExc_TypeError, "iter() of non-sequence");
+               PyErr_SetString(PyExc_TypeError, "iteration over non-sequence");
                return NULL;
        }
        Py_DECREF(func);

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index b8a459302cd0e4b10da24bbc1e179f99a1e51b9a..e5e7dcd6f427b9f8b4ac61614126fa3bad31a483 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3261,7 +3261,7 @@ slot_tp_iter(PyObject *self)
        PyErr_Clear();
        func = lookup_method(self, "__getitem__", &getitem_str);
        if (func == NULL) {
-               PyErr_SetString(PyExc_TypeError, "iter() of non-sequence");
+               PyErr_SetString(PyExc_TypeError, "iteration over non-sequence");
                return NULL;
        }
        Py_DECREF(func);

diff --git a/Python/ceval.c b/Python/ceval.c
index 731e93fa834ccc1759f128f765e81609661470d5..132fb726a606b74f9ea729f97f06ee75ff7e5cdc 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1556,8 +1556,12 @@ eval_frame(PyFrameObject *f)
                        else if (unpack_iterable(v, oparg,
                                                 stack_pointer + oparg))
                                stack_pointer += oparg;
-                       else
+                       else {
+                               if (PyErr_ExceptionMatches(PyExc_TypeError))
+                                       PyErr_SetString(PyExc_TypeError,
+                                               "unpack non-sequence");
                                why = WHY_EXCEPTION;
+                       }
                        Py_DECREF(v);
                        break;