From: Georg Brandl Date: Tue, 11 Mar 2014 09:28:56 +0000 (+0100) Subject: #13530: port to 2.7 branch (document what os.lseek returns). X-Git-Tag: v2.7.7rc1~142 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d07641fce428abf826a0d90ce0aeaf0e3450587;p=thirdparty%2FPython%2Fcpython.git #13530: port to 2.7 branch (document what os.lseek returns). --- diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 679cedb9479e..fe030961aedf 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -744,7 +744,7 @@ as internal buffering of data. by *how*: :const:`SEEK_SET` or ``0`` to set the position relative to the beginning of the file; :const:`SEEK_CUR` or ``1`` to set it relative to the current position; :const:`SEEK_END` or ``2`` to set it relative to the end of - the file. + the file. Return the new cursor position in bytes, starting from the beginning. Availability: Unix, Windows. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index c1b300a42cd9..21a6cef3f790 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6667,7 +6667,8 @@ posix_dup2(PyObject *self, PyObject *args) PyDoc_STRVAR(posix_lseek__doc__, "lseek(fd, pos, how) -> newpos\n\n\ -Set the current position of a file descriptor."); +Set the current position of a file descriptor.\n\ +Return the new cursor position in bytes, starting from the beginning."); static PyObject * posix_lseek(PyObject *self, PyObject *args)