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

stop throwing out all errors when PyObject_GetAttr fails

This commit is contained in:
Benjamin Peterson 2009-06-06 20:46:48 +00:00
parent 0926ad1f05
commit 2cfca7977e
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Modules/_io/textio.c
View File

@ -988,8 +988,12 @@ TextIOWrapper_init(PyTextIOWrapperObject *self, PyObject *args, PyObject *kwds)
goto error;
res = PyObject_GetAttrString(ci, "name");
Py_DECREF(ci);
if (res == NULL)
PyErr_Clear();
if (res == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear();
else
goto error;
}
else if (PyUnicode_Check(res)) {
encodefuncentry *e = encodefuncs;
while (e->name != NULL) {
@ -1011,8 +1015,12 @@ TextIOWrapper_init(PyTextIOWrapperObject *self, PyObject *args, PyObject *kwds)
Py_TYPE(buffer) == &PyBufferedRandom_Type) {
raw = PyObject_GetAttrString(buffer, "raw");
/* Cache the raw FileIO object to speed up 'closed' checks */
if (raw == NULL)
PyErr_Clear();
if (raw == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear();
else
goto error;
}
else if (Py_TYPE(raw) == &PyFileIO_Type)
self->raw = raw;
else
@ -2468,8 +2476,13 @@ TextIOWrapper_newlines_get(PyTextIOWrapperObject *self, void *context)
Py_RETURN_NONE;
res = PyObject_GetAttr(self->decoder, _PyIO_str_newlines);
if (res == NULL) {
PyErr_Clear();
Py_RETURN_NONE;
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
Py_RETURN_NONE;
}
else {
return NULL;
}
}
return res;
}