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

remove dead code #9292

This commit is contained in:
Benjamin Peterson 2010-08-08 16:54:58 +00:00
parent 37d3d9aa96
commit 4e7f285252
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Modules/pyexpat.c
View File

@ -855,18 +855,15 @@ static PyObject *
xmlparse_ParseFile(xmlparseobject *self, PyObject *f) xmlparse_ParseFile(xmlparseobject *self, PyObject *f)
{ {
int rv = 1; int rv = 1;
FILE *fp;
PyObject *readmethod = NULL; PyObject *readmethod = NULL;
{
fp = NULL; readmethod = PyObject_GetAttrString(f, "read");
readmethod = PyObject_GetAttrString(f, "read"); if (readmethod == NULL) {
if (readmethod == NULL) { PyErr_Clear();
PyErr_Clear(); PyErr_SetString(PyExc_TypeError,
PyErr_SetString(PyExc_TypeError, "argument must have 'read' attribute");
"argument must have 'read' attribute"); return NULL;
return NULL;
}
} }
for (;;) { for (;;) {
int bytes_read; int bytes_read;
@ -876,19 +873,10 @@ xmlparse_ParseFile(xmlparseobject *self, PyObject *f)
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
if (fp) { bytes_read = readinst(buf, BUF_SIZE, readmethod);
bytes_read = fread(buf, sizeof(char), BUF_SIZE, fp); if (bytes_read < 0) {
if (bytes_read < 0) { Py_DECREF(readmethod);
PyErr_SetFromErrno(PyExc_IOError); return NULL;
return NULL;
}
}
else {
bytes_read = readinst(buf, BUF_SIZE, readmethod);
if (bytes_read < 0) {
Py_DECREF(readmethod);
return NULL;
}
} }
rv = XML_ParseBuffer(self->itself, bytes_read, bytes_read == 0); rv = XML_ParseBuffer(self->itself, bytes_read, bytes_read == 0);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {