traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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".
This commit is contained in:
Tim Peters 2001-09-30 05:58:42 +00:00
parent d38b1c74f3
commit 8b13b3ede2
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/abstract.c
View File

@ -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 {

2
Objects/classobject.c
View File

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

2
Objects/typeobject.c
View File

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

6
Python/ceval.c
View File

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