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

Merged revisions 68763,68773 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68763 | kristjan.jonsson | 2009-01-19 07:10:27 -0600 (Mon, 19 Jan 2009) | 2 lines

  Issue 4957
  Let os.ftruncate raise OSError like documented.
........
  r68773 | benjamin.peterson | 2009-01-19 09:51:27 -0600 (Mon, 19 Jan 2009) | 1 line

  simplify code
........
This commit is contained in:
Benjamin Peterson 2009-01-19 17:53:36 +00:00
parent 6214edd1bb
commit 9053d75485
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_os.py
View File

@ -624,10 +624,9 @@ class TestInvalidFD(unittest.TestCase):
if hasattr(os, "fpathconf"):
self.assertRaises(OSError, os.fpathconf, 10, "PC_NAME_MAX")
#this is a weird one, it raises IOError unlike the others
def test_ftruncate(self):
if hasattr(os, "ftruncate"):
self.assertRaises(IOError, os.ftruncate, 10, 0)
self.assertRaises(OSError, os.ftruncate, 10, 0)
def test_lseek(self):
if hasattr(os, "lseek"):

6
Modules/posixmodule.c
View File

@ -5114,10 +5114,8 @@ posix_ftruncate(PyObject *self, PyObject *args)
Py_BEGIN_ALLOW_THREADS
res = ftruncate(fd, length);
Py_END_ALLOW_THREADS
if (res < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
if (res < 0)
return posix_error();
Py_INCREF(Py_None);
return Py_None;
}