[Python-checkins] cpython (merge 3.2 -> default): #4841: Fix FileIO constructor to honor closefd when called repeatedly
hynek.schlawack
python-checkins at python.org
Fri May 25 10:30:17 CEST 2012
http://hg.python.org/cpython/rev/d2b511592cc5
changeset: 77136:d2b511592cc5
parent: 77133:17f48832e749
parent: 77135:8a58670048c9
user: Hynek Schlawack <hs at ox.cx>
date: Fri May 25 10:27:43 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
@@ -643,6 +643,19 @@
with self.open("non-existent", "r", opener=opener) as f:
self.assertEqual(f.read(), "egg\n")
+ 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
@@ -230,9 +230,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|siO:fileio",
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list