[Python-checkins] cpython (2.7): #4841: Fix FileIO constructor to honor closefd when called repeatedly

[hynek.schlawack]

http://hg.python.org/cpython/rev/83d500908ffc
changeset:   77134:83d500908ffc
branch:      2.7
parent:      77125:13197ce81b0d
user:        Hynek Schlawack <hs at ox.cx>
date:        Fri May 25 09:24:18 2012 +0200
summary:
  #4841: Fix FileIO constructor to honor closefd when called repeatedly

Patch by Victor Stinner.

files:
  Lib/test/test_io.py  |  13 +++++++++++++
  Modules/_io/fileio.c |  10 +++++++---
  2 files changed, 20 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -593,6 +593,19 @@
         self.assertEqual(rawio.read(2), None)
         self.assertEqual(rawio.read(2), b"")
 
+    def test_fileio_closefd(self):
+        # Issue #4841
+        with self.open(__file__, 'rb') as f1, \
+             self.open(__file__, 'rb') as f2:
+            fileio = self.FileIO(f1.fileno(), closefd=False)
+            # .__init__() must not close f1
+            fileio.__init__(f2.fileno(), closefd=False)
+            f1.readline()
+            # .close() must not close f2
+            fileio.close()
+            f2.readline()
+
+
 class CIOTest(IOTest):
 
     def test_IOBase_finalize(self):
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -198,9 +198,13 @@
 
     assert(PyFileIO_Check(oself));
     if (self->fd >= 0) {
-        /* Have to close the existing file first. */
-        if (internal_close(self) < 0)
-            return -1;
+        if (self->closefd) {
+            /* Have to close the existing file first. */
+            if (internal_close(self) < 0)
+                return -1;
+        }
+        else
+            self->fd = -1;
     }
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|si:fileio",

-- 
Repository URL: http://hg.python.org/cpython