Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

correctly handle invalid operations on streams (like writing on a non-writable one)

This commit is contained in:
Benjamin Peterson 2009-05-14 22:01:31 +00:00
parent 37d1c18bda
commit 81971eafbe
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/test_io.py
View File

@ -290,6 +290,19 @@ class IOTest(unittest.TestCase):
self.assertEqual(f.seek(-1, 2), self.LARGE)
self.assertEqual(f.read(2), b"x")
def test_invalid_operations(self):
# Try writing on a file opened in read mode and vice-versa.
for mode in ("w", "wb"):
with open(support.TESTFN, mode) as fp:
self.assertRaises(IOError, fp.read)
self.assertRaises(IOError, fp.readline)
with open(support.TESTFN, "rb") as fp:
self.assertRaises(IOError, fp.write, b"blah")
self.assertRaises(IOError, fp.writelines, [b"blah\n"])
with open(support.TESTFN, "r") as fp:
self.assertRaises(IOError, fp.write, "blah")
self.assertRaises(IOError, fp.writelines, ["blah\n"])
def test_raw_file_io(self):
with self.open(support.TESTFN, "wb", buffering=0) as f:
self.assertEqual(f.readable(), False)

7
Modules/_io/textio.c
View File

@ -1228,6 +1228,11 @@ TextIOWrapper_write(PyTextIOWrapperObject *self, PyObject *args)
CHECK_CLOSED(self);
if (self->encoder == NULL) {
PyErr_SetString(PyExc_IOError, "not writable");
return NULL;
}
Py_INCREF(text);
textlen = PyUnicode_GetSize(text);
@ -1363,7 +1368,7 @@ TextIOWrapper_read_chunk(PyTextIOWrapperObject *self)
*/
if (self->decoder == NULL) {
PyErr_SetString(PyExc_ValueError, "no decoder");
PyErr_SetString(PyExc_IOError, "not readable");
return -1;
}