summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-04-01 21:22:20 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-04-01 21:22:20 (GMT)
commit0e4caf4bd2e5a964c916a06fff64d5cadbe623b6 (patch)
treef1ac83f88e0be6544a8ee0ed310283cf27d29d0f
parent1fd32a6731295ae046383155c630c697e7a631a1 (diff)
downloadcpython-0e4caf4bd2e5a964c916a06fff64d5cadbe623b6.zip
cpython-0e4caf4bd2e5a964c916a06fff64d5cadbe623b6.tar.gz
cpython-0e4caf4bd2e5a964c916a06fff64d5cadbe623b6.tar.bz2
Merged revisions 70992,70995 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70992 | georg.brandl | 2009-04-01 16:00:55 -0500 (Wed, 01 Apr 2009) | 1 line #4572: add SEEK_* values as constants in io.py. ........ r70995 | benjamin.peterson | 2009-04-01 16:12:54 -0500 (Wed, 01 Apr 2009) | 1 line add seek constants to __all__ ........
-rw-r--r--Doc/library/io.rst12
-rw-r--r--Lib/io.py8
2 files changed, 16 insertions, 4 deletions
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index e06ab3f..9e4161a 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -270,12 +270,18 @@ I/O Base Classes
interpreted relative to the position indicated by *whence*. Values for
*whence* are:
- * ``0`` -- start of the stream (the default); *offset* should be zero or positive
- * ``1`` -- current stream position; *offset* may be negative
- * ``2`` -- end of the stream; *offset* is usually negative
+ * :data:`SEEK_SET` or ``0`` -- start of the stream (the default);
+ *offset* should be zero or positive
+ * :data:`SEEK_CUR` or ``1`` -- current stream position; *offset* may
+ be negative
+ * :data:`SEEK_END` or ``2`` -- end of the stream; *offset* is usually
+ negative
Return the new absolute position.
+ .. versionadded:: 2.7
+ The ``SEEK_*`` constants
+
.. method:: seekable()
Return ``True`` if the stream supports random access. If ``False``,
diff --git a/Lib/io.py b/Lib/io.py
index 8a8cf69..56ceb58 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -52,7 +52,8 @@ __author__ = ("Guido van Rossum <guido@python.org>, "
__all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO",
"BytesIO", "StringIO", "BufferedIOBase",
"BufferedReader", "BufferedWriter", "BufferedRWPair",
- "BufferedRandom", "TextIOBase", "TextIOWrapper"]
+ "BufferedRandom", "TextIOBase", "TextIOWrapper",
+ "SEEK_SET", "SEEK_CUR", "SEEK_END"]
import _io
@@ -65,6 +66,11 @@ from _io import (DEFAULT_BUFFER_SIZE, BlockingIOError, UnsupportedOperation,
OpenWrapper = _io.open # for compatibility with _pyio
+# for seek()
+SEEK_SET = 0
+SEEK_CUR = 1
+SEEK_END = 2
+
# Declaring ABCs in C is tricky so we do it here.
# Method descriptions and default implementations are inherited from the C
# version however.