summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-10-30 21:26:15 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-10-30 21:26:15 (GMT)
commitab5f87902299fb92a2dbae356c853158881cd980 (patch)
tree1b97f39a2ada0bb8f326ae7096a3a7c7f03bfd91
parent69a9c5b539dd848369efcd67574e447065f638e9 (diff)
downloadcpython-ab5f87902299fb92a2dbae356c853158881cd980.zip
cpython-ab5f87902299fb92a2dbae356c853158881cd980.tar.gz
cpython-ab5f87902299fb92a2dbae356c853158881cd980.tar.bz2
Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members.
-rw-r--r--Lib/test/test_io.py7
-rw-r--r--Modules/_fileio.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 9ef2a81..08a524f 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -1236,6 +1236,13 @@ class MiscIOTest(unittest.TestCase):
else:
self.assert_(issubclass(obj, io.IOBase))
+ def test_fileio_warnings(self):
+ with test_support.check_warnings() as w:
+ self.assertEqual(w.warnings, [])
+ self.assertRaises(TypeError, io.FileIO, [])
+ self.assertEqual(w.warnings, [])
+ self.assertRaises(ValueError, io.FileIO, "/some/invalid/name", "rt")
+ self.assertEqual(w.warnings, [])
def test_main():
test_support.run_unittest(IOTest, BytesIOTest, StringIOTest,
diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index b33b745..49bc29c 100644
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -86,6 +86,10 @@ fileio_new(PyTypeObject *type, PyObject *args, PyObject *kews)
self = (PyFileIOObject *) type->tp_alloc(type, 0);
if (self != NULL) {
self->fd = -1;
+ self->readable = 0;
+ self->writable = 0;
+ self->seekable = -1;
+ self->closefd = 1;
self->weakreflist = NULL;
}
@@ -179,8 +183,6 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
}
}
- self->readable = self->writable = 0;
- self->seekable = -1;
s = mode;
while (*s) {
switch (*s++) {