changeset:   93125:a1500e4a159a
user:        Robert Collins <rbtcollins@hp.com>
date:        Sat Oct 18 13:32:43 2014 +1300
files:       Doc/library/functions.rst Doc/library/io.rst Lib/test/test_fileio.py Misc/NEWS Modules/_io/fileio.c
description:
Issue #17401: document closefd in io.FileIO docs and add to repr

closefd was documented in the open docs but not the matching FileIO
class documented. Further, closefd, part of the core state for the
object was not shown.

In review it was noted that the open docs are a little confusing about
the interaction between closefd and paths, so tweaked them at the same
time.


diff -r 8ed630f28753 -r a1500e4a159a Doc/library/functions.rst
--- a/Doc/library/functions.rst	Fri Oct 17 20:30:16 2014 -0400
+++ b/Doc/library/functions.rst	Sat Oct 18 13:32:43 2014 +1300
@@ -995,8 +995,8 @@
 
    If *closefd* is ``False`` and a file descriptor rather than a filename was
    given, the underlying file descriptor will be kept open when the file is
-   closed.  If a filename is given *closefd* has no effect and must be ``True``
-   (the default).
+   closed.  If a filename is given *closefd* must be ``True`` (the default)
+   otherwise an error will be raised.
 
    A custom opener can be used by passing a callable as *opener*. The underlying
    file descriptor for the file object is then obtained by calling *opener* with
diff -r 8ed630f28753 -r a1500e4a159a Doc/library/io.rst
--- a/Doc/library/io.rst	Fri Oct 17 20:30:16 2014 -0400
+++ b/Doc/library/io.rst	Sat Oct 18 13:32:43 2014 +1300
@@ -519,9 +519,12 @@
    The *name* can be one of two things:
 
    * a character string or :class:`bytes` object representing the path to the
-     file which will be opened;
+     file which will be opened. In this case closefd must be True (the default)
+     otherwise an error will be raised.
    * an integer representing the number of an existing OS-level file descriptor
-     to which the resulting :class:`FileIO` object will give access.
+     to which the resulting :class:`FileIO` object will give access. When the
+     FileIO object is closed this fd will be closed as well, unless *closefd*
+     is set to ``False``.
 
    The *mode* can be ``'r'``, ``'w'``, ``'x'`` or ``'a'`` for reading
    (default), writing, exclusive creation or appending. The file will be
diff -r 8ed630f28753 -r a1500e4a159a Lib/test/test_fileio.py
--- a/Lib/test/test_fileio.py	Fri Oct 17 20:30:16 2014 -0400
+++ b/Lib/test/test_fileio.py	Sat Oct 18 13:32:43 2014 +1300
@@ -112,11 +112,13 @@
         self.assertRaises(TypeError, self.f.write, "Hello!")
 
     def testRepr(self):
-        self.assertEqual(repr(self.f), "<_io.FileIO name=%r mode=%r>"
-                                        % (self.f.name, self.f.mode))
+        self.assertEqual(
+            repr(self.f), "<_io.FileIO name=%r mode=%r closefd='%d'>"
+                          % (self.f.name, self.f.mode, self.f.closefd))
         del self.f.name
-        self.assertEqual(repr(self.f), "<_io.FileIO fd=%r mode=%r>"
-                                        % (self.f.fileno(), self.f.mode))
+        self.assertEqual(
+            repr(self.f), "<_io.FileIO fd=%r mode=%r closefd='%d'>"
+                          % (self.f.fileno(), self.f.mode, self.f.closefd))
         self.f.close()
         self.assertEqual(repr(self.f), "<_io.FileIO [closed]>")
 
diff -r 8ed630f28753 -r a1500e4a159a Misc/NEWS
--- a/Misc/NEWS	Fri Oct 17 20:30:16 2014 -0400
+++ b/Misc/NEWS	Sat Oct 18 13:32:43 2014 +1300
@@ -196,6 +196,8 @@
 - Issue #22641: In asyncio, the default SSL context for client connections
   is now created using ssl.create_default_context(), for stronger security.
 
+- Issue #17401: Include closefd in io.FileIO repr.
+
 - Issue #21338: Add silent mode for compileall. quiet parameters of
   compile_{dir, file, path} functions now have a multilevel value. Also,
   -q option of the CLI now have a multilevel value. Patch by Thomas Kluyver.
diff -r 8ed630f28753 -r a1500e4a159a Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Fri Oct 17 20:30:16 2014 -0400
+++ b/Modules/_io/fileio.c	Sat Oct 18 13:32:43 2014 +1300
@@ -1054,12 +1054,14 @@
             PyErr_Clear();
         else
             return NULL;
-        res = PyUnicode_FromFormat("<_io.FileIO fd=%d mode='%s'>",
-                                   self->fd, mode_string(self));
+        res = PyUnicode_FromFormat(
+	    "<_io.FileIO fd=%d mode='%s' closefd='%d'>",
+	    self->fd, mode_string(self), self->closefd);
     }
     else {
-        res = PyUnicode_FromFormat("<_io.FileIO name=%R mode='%s'>",
-                                   nameobj, mode_string(self));
+        res = PyUnicode_FromFormat(
+	    "<_io.FileIO name=%R mode='%s' closefd='%d'>",
+	    nameobj, mode_string(self), self->closefd);
         Py_DECREF(nameobj);
     }
     return res;