[Python-checkins] r83973 - in python/branches/py3k: Doc/c-api/file.rst Objects/fileobject.c

[victor.stinner]

Author: victor.stinner
Date: Fri Aug 13 15:34:52 2010
New Revision: 83973

Log:
Issue #9425: PyFile_FromFd() ignores the name argument

This function is only by imp.find_module() which does return the filename in a
separated variable.


Modified:
   python/branches/py3k/Doc/c-api/file.rst
   python/branches/py3k/Objects/fileobject.c

Modified: python/branches/py3k/Doc/c-api/file.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/file.rst	(original)
+++ python/branches/py3k/Doc/c-api/file.rst	Fri Aug 13 15:34:52 2010
@@ -22,8 +22,9 @@
    Create a Python file object from the file descriptor of an already
    opened file *fd*.  The arguments *name*, *encoding*, *errors* and *newline*
    can be *NULL* to use the defaults; *buffering* can be *-1* to use the
-   default.  Return *NULL* on failure.  For a more comprehensive description of
-   the arguments, please refer to the :func:`io.open` function documentation.
+   default. *name* is ignored and kept for backward compatibility. Return
+   *NULL* on failure. For a more comprehensive description of the arguments,
+   please refer to the :func:`io.open` function documentation.
 
    .. warning::
 
@@ -31,6 +32,9 @@
      OS-level file descriptors can produce various issues (such as unexpected
      ordering of data).
 
+   .. versionchanged:: 3.2
+      Ignore *name* attribute.
+
 
 .. cfunction:: int PyObject_AsFileDescriptor(PyObject *p)
 

Modified: python/branches/py3k/Objects/fileobject.c
==============================================================================
--- python/branches/py3k/Objects/fileobject.c	(original)
+++ python/branches/py3k/Objects/fileobject.c	Fri Aug 13 15:34:52 2010
@@ -29,7 +29,7 @@
 PyFile_FromFd(int fd, char *name, char *mode, int buffering, char *encoding,
               char *errors, char *newline, int closefd)
 {
-    PyObject *io, *stream, *nameobj = NULL;
+    PyObject *io, *stream;
 
     io = PyImport_ImportModule("io");
     if (io == NULL)
@@ -40,16 +40,8 @@
     Py_DECREF(io);
     if (stream == NULL)
         return NULL;
-    if (name != NULL) {
-        nameobj = PyUnicode_DecodeFSDefault(name);
-        if (nameobj == NULL)
-            PyErr_Clear();
-        else {
-            if (PyObject_SetAttrString(stream, "name", nameobj) < 0)
-                PyErr_Clear();
-            Py_DECREF(nameobj);
-        }
-    }
+    /* ignore name attribute because the name attribute of _BufferedIOMixin
+       and TextIOWrapper is read only */
     return stream;
 }