From: Georg Brandl Date: Tue, 23 Oct 2007 18:26:17 +0000 (+0000) Subject: Remove duplicate entry for PyObject_AsFileDescriptor. X-Git-Tag: v3.0a2~287 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=083bea49a8b74a5f758c6641c299f0cc8c114616;p=thirdparty%2FPython%2Fcpython.git Remove duplicate entry for PyObject_AsFileDescriptor. --- diff --git a/Doc/c-api/abstract.rst b/Doc/c-api/abstract.rst index 515150d45942..4a786504779d 100644 --- a/Doc/c-api/abstract.rst +++ b/Doc/c-api/abstract.rst @@ -327,10 +327,7 @@ is considered sufficient for this determination. .. cfunction:: int PyObject_AsFileDescriptor(PyObject *o) - Derives a file-descriptor from a Python object. If the object is an integer or - long integer, its value is returned. If not, the object's :meth:`fileno` method - is called if it exists; the method must return an integer or long integer, which - is returned as the file descriptor value. Returns ``-1`` on failure. + Derives a file-descriptor from a Python object. .. cfunction:: PyObject* PyObject_Dir(PyObject *o) diff --git a/Doc/c-api/concrete.rst b/Doc/c-api/concrete.rst index 1855688a2cc6..f492f160fc7f 100644 --- a/Doc/c-api/concrete.rst +++ b/Doc/c-api/concrete.rst @@ -2420,13 +2420,17 @@ change in future releases of Python. .. warning:: Take care when you are mixing streams and descriptors! For more - information, see `GNU C Library + information, see `the GNU C Library docs `_. .. cfunction:: int PyObject_AsFileDescriptor(PyObject *p) - Return the file descriptor associated with *p* as an :ctype:`int`. + Return the file descriptor associated with *p* as an :ctype:`int`. If the + object is an integer or long integer, its value is returned. If not, the + object's :meth:`fileno` method is called if it exists; the method must return + an integer, which is returned as the file descriptor value. Sets an + exception and returns ``-1`` on failure. .. cfunction:: PyObject* PyFile_GetLine(PyObject *p, int n)