diff options
| author | Georg Brandl <georg@python.org> | 2009-10-27 14:37:48 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-10-27 14:37:48 (GMT) |
| commit | 4ae4f876a2f48e7706c874e267285e88eb955723 (patch) | |
| tree | 2da9fa31295d283b4b0ddfe232c476cc82a51762 /Doc/distutils | |
| parent | 0dfdf006a6e421cf9a8155b6d20e6e39c6387e92 (diff) | |
| download | cpython-4ae4f876a2f48e7706c874e267285e88eb955723.zip cpython-4ae4f876a2f48e7706c874e267285e88eb955723.tar.gz cpython-4ae4f876a2f48e7706c874e267285e88eb955723.tar.bz2 | |
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line
builtin -> built-in.
........
Diffstat (limited to 'Doc/distutils')
| -rw-r--r-- | Doc/distutils/apiref.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index 995b767..0a51b7c 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -1623,7 +1623,7 @@ lines, and joining lines with backslashes. +------------------+--------------------------------+---------+ Note that since *rstrip_ws* can strip the trailing newline, the semantics of - :meth:`readline` must differ from those of the builtin file object's + :meth:`readline` must differ from those of the built-in file object's :meth:`readline` method! In particular, :meth:`readline` returns ``None`` for end-of-file: an empty string might just be a blank line (or an all-whitespace line), if *rstrip_ws* is true but *skip_blanks* is not. @@ -1631,8 +1631,8 @@ lines, and joining lines with backslashes. .. method:: TextFile.open(filename) - Open a new file *filename*. This overrides any *file* or *filename* constructor - arguments. + Open a new file *filename*. This overrides any *file* or *filename* + constructor arguments. .. method:: TextFile.close() |