Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members.

tiran · tiran · commit df32b3967c81 · 2008-10-30T21:23:35.000Z
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
@@ -1237,6 +1237,13 @@ def testImport__all__(self):
             else:
                 self.assert_(issubclass(obj, io.IOBase))
 
+    def test_fileio_warnings(self):
+        with 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():
     support.run_unittest(IOTest, BytesIOTest, StringIOTest,
diff --git 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++) {

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,10 @@ fileio_new(PyTypeObject type, PyObject args, PyObject *kews)`
`86`	`86`	`self = (PyFileIOObject *) type->tp_alloc(type, 0);`
`87`	`87`	`if (self != NULL) {`
`88`	`88`	`self->fd = -1;`
	`89`	`+ self->readable = 0;`
	`90`	`+ self->writable = 0;`
	`91`	`+ self->seekable = -1;`
	`92`	`+ self->closefd = 1;`
`89`	`93`	`self->weakreflist = NULL;`
`90`	`94`	`}`
`91`	`95`
`@@ -179,8 +183,6 @@ fileio_init(PyObject oself, PyObject args, PyObject *kwds)`
`179`	`183`	`}`
`180`	`184`	`}`
`181`	`185`
`182`		`- self->readable = self->writable = 0;`
`183`		`- self->seekable = -1;`
`184`	`186`	`s = mode;`
`185`	`187`	`while (*s) {`
`186`	`188`	`switch (*s++) {`