diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-27 21:24:03 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-27 21:24:03 (GMT) |
| commit | c3be11aac35f4ac1be6542f8f767dd5c3ccc9dbf (patch) | |
| tree | 9eb373d6e849d41268bcd5525e2bf8971460c056 /Lib | |
| parent | ad142d306dbfdbc6d91984b051d276a2c2ce9184 (diff) | |
| download | cpython-c3be11aac35f4ac1be6542f8f767dd5c3ccc9dbf.zip cpython-c3be11aac35f4ac1be6542f8f767dd5c3ccc9dbf.tar.gz cpython-c3be11aac35f4ac1be6542f8f767dd5c3ccc9dbf.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/_pyio.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index c9c4297..1fbefd2 100644 --- 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__) |