diff options
author | R David Murray <rdmurray@bitdance.com> | 2012-08-15 15:05:36 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2012-08-15 15:05:36 (GMT) |
commit | ee0a945ae4077d9e4ffdb77e247ed13265316897 (patch) | |
tree | 867c956f41f97c2dec722ed838d41934d7d6d460 /Doc/whatsnew | |
parent | 1b00f25bf99d9b7a5f307984f6467258de636d23 (diff) | |
download | cpython-ee0a945ae4077d9e4ffdb77e247ed13265316897.zip cpython-ee0a945ae4077d9e4ffdb77e247ed13265316897.tar.gz cpython-ee0a945ae4077d9e4ffdb77e247ed13265316897.tar.bz2 |
#15543: reflow paragraphs.
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r-- | Doc/whatsnew/2.3.rst | 13 | ||||
-rw-r--r-- | Doc/whatsnew/2.5.rst | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst index f71422f..f4c79e4 100644 --- a/Doc/whatsnew/2.3.rst +++ b/Doc/whatsnew/2.3.rst @@ -379,13 +379,12 @@ mark the ends of lines in text files. Unix uses the linefeed (ASCII character 10), MacOS uses the carriage return (ASCII character 13), and Windows uses a two-character sequence of a carriage return plus a newline. -Python's file objects can now support end of line conventions other than the one -followed by the platform on which Python is running. Opening a file with the -mode ``'U'`` or ``'rU'`` will open a file for reading in -:term:`universal newlines` mode. -All three line ending conventions will be translated to a ``'\n'`` in the -strings returned by the various file methods such as :meth:`read` and -:meth:`readline`. +Python's file objects can now support end of line conventions other than the +one followed by the platform on which Python is running. Opening a file with +the mode ``'U'`` or ``'rU'`` will open a file for reading in :term:`universal +newlines` mode. All three line ending conventions will be translated to a +``'\n'`` in the strings returned by the various file methods such as +:meth:`read` and :meth:`readline`. Universal newline support is also used when importing modules and when executing a file with the :func:`execfile` function. This means that Python modules can diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index afe0f5e..e059cd5 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -1343,12 +1343,12 @@ complete list of changes, or look through the SVN logs for all the details. * The :mod:`fileinput` module was made more flexible. Unicode filenames are now supported, and a *mode* parameter that defaults to ``"r"`` was added to the - :func:`input` function to allow opening files in binary or - :term:`universal newlines` mode. - Another new parameter, *openhook*, lets you use a function other than - :func:`open` to open the input files. Once you're iterating over the set of - files, the :class:`FileInput` object's new :meth:`fileno` returns the file - descriptor for the currently opened file. (Contributed by Georg Brandl.) + :func:`input` function to allow opening files in binary or :term:`universal + newlines` mode. Another new parameter, *openhook*, lets you use a function + other than :func:`open` to open the input files. Once you're iterating over + the set of files, the :class:`FileInput` object's new :meth:`fileno` returns + the file descriptor for the currently opened file. (Contributed by Georg + Brandl.) * In the :mod:`gc` module, the new :func:`get_count` function returns a 3-tuple containing the current collection counts for the three GC generations. This is |