mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-21 01:15:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 83031 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83031 | antoine.pitrou | 2010-07-21 18:47:28 +0200 (mer., 21 juil. 2010) | 11 lines

  Merged revisions 83030 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83030 | antoine.pitrou | 2010-07-21 18:41:31 +0200 (mer., 21 juil. 2010) | 5 lines

    Issue #5395: check that array.fromfile() re-raises an IOError instead of replacing it
    with EOFError.
    (this is only an added test, but 2.x will get a fix too)
  ........
................
This commit is contained in:
Antoine Pitrou 2010-07-21 16:50:52 +00:00
parent f247101a4c
commit ea435512ea
4 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/arraymodule.c
View file

@ -1262,8 +1262,14 @@ array_fromfile(arrayobject *self, PyObject *args)
PyMem_RESIZE(item, char, Py_SIZE(self)*itemsize);
self->ob_item = item;
self->allocated = Py_SIZE(self);
PyErr_SetString(PyExc_EOFError,
"not enough items in file");
if (ferror(fp)) {
PyErr_SetFromErrno(PyExc_IOError);
clearerr(fp);
}
else {
PyErr_SetString(PyExc_EOFError,
"not enough items in file");
}
return NULL;
}
}