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 ac95123..7a5305a 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1859,7 +1859,7 @@
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 df10aa2..cef1894 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -1839,7 +1839,7 @@
}
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 b8a4593..e5e7dcd 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3261,7 +3261,7 @@
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);