Merged revisions 80548-80549 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80548 | benjamin.peterson | 2010-04-27 16:18:30 -0500 (Tue, 27 Apr 2010) | 1 line

  condense import
........
  r80549 | benjamin.peterson | 2010-04-27 16:19:06 -0500 (Tue, 27 Apr 2010) | 1 line

  correct signature
........

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index c9c42977007f56406c346ed0bbb5329c3a469406..1fbefd239f3001c127dc94dd176b83d0e8a49035 100644 (file)
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -13,8 +13,7 @@ except ImportError:
     from _dummy_thread import allocate_lock as Lock
 
 import io
-from io import __all__
-from io import SEEK_SET, SEEK_CUR, SEEK_END
+from io import (__all__, SEEK_SET, SEEK_CUR, SEEK_END)
 
 # open() uses st_blksize whenever we can
 DEFAULT_BUFFER_SIZE = 8 * 1024  # bytes
@@ -226,7 +225,7 @@ class DocDescriptor:
     """
     def __get__(self, obj, typ):
         return (
-            "open(file, mode='r', buffering=None, encoding=None, "
+            "open(file, mode='r', buffering=-1, encoding=None, "
                  "errors=None, newline=None, closefd=True)\n\n" +
             open.__doc__)