Commit 0e8e78e1 authored by Martin Panter's avatar Martin Panter

Issue #25030: Merge seek() doc fixes from 3.4 into 3.5

parents b6855150 db4220ea
...@@ -301,11 +301,11 @@ I/O Base Classes ...@@ -301,11 +301,11 @@ I/O Base Classes
Note that it's already possible to iterate on file objects using ``for Note that it's already possible to iterate on file objects using ``for
line in file: ...`` without calling ``file.readlines()``. line in file: ...`` without calling ``file.readlines()``.
.. method:: seek(offset, whence=SEEK_SET) .. method:: seek(offset[, whence])
Change the stream position to the given byte *offset*. *offset* is Change the stream position to the given byte *offset*. *offset* is
interpreted relative to the position indicated by *whence*. Values for interpreted relative to the position indicated by *whence*. The default
*whence* are: value for *whence* is :data:`SEEK_SET`. Values for *whence* are:
* :data:`SEEK_SET` or ``0`` -- start of the stream (the default); * :data:`SEEK_SET` or ``0`` -- start of the stream (the default);
*offset* should be zero or positive *offset* should be zero or positive
...@@ -783,10 +783,11 @@ Text I/O ...@@ -783,10 +783,11 @@ Text I/O
If *size* is specified, at most *size* characters will be read. If *size* is specified, at most *size* characters will be read.
.. method:: seek(offset, whence=SEEK_SET) .. method:: seek(offset[, whence])
Change the stream position to the given *offset*. Behaviour depends Change the stream position to the given *offset*. Behaviour depends on
on the *whence* parameter: the *whence* parameter. The default value for *whence* is
:data:`SEEK_SET`.
* :data:`SEEK_SET` or ``0``: seek from the start of the stream * :data:`SEEK_SET` or ``0``: seek from the start of the stream
(the default); *offset* must either be a number returned by (the default); *offset* must either be a number returned by
......
...@@ -1312,6 +1312,7 @@ Alexander Shigin ...@@ -1312,6 +1312,7 @@ Alexander Shigin
Pete Shinners Pete Shinners
Michael Shiplett Michael Shiplett
John W. Shipman John W. Shipman
Shiyao Ma
Alex Shkop Alex Shkop
Joel Shprentz Joel Shprentz
Yue Shuaijie Yue Shuaijie
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment