[Python-checkins] r70996 - in python/branches/py3k: Doc/library/io.rst Lib/io.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Apr  1 23:22:20 2009
New Revision: 70996

Log:
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__
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/io.rst
   python/branches/py3k/Lib/io.py

Modified: python/branches/py3k/Doc/library/io.rst
==============================================================================
--- python/branches/py3k/Doc/library/io.rst	(original)
+++ python/branches/py3k/Doc/library/io.rst	Wed Apr  1 23:22:20 2009
@@ -270,12 +270,18 @@
       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``,

Modified: python/branches/py3k/Lib/io.py
==============================================================================
--- python/branches/py3k/Lib/io.py	(original)
+++ python/branches/py3k/Lib/io.py	Wed Apr  1 23:22:20 2009
@@ -52,7 +52,8 @@
 __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 @@
 
 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.