diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-08-15 15:11:27 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-08-15 15:11:27 (GMT) |
| commit | 27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169 (patch) | |
| tree | d4a7886a29e92e4811c1087086aa30e1c27eb586 /Doc/glossary.rst | |
| parent | 592df20efcc41d2448c8acc35b3b4f15aa5c0bf2 (diff) | |
| parent | ee0a945ae4077d9e4ffdb77e247ed13265316897 (diff) | |
| download | cpython-27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169.zip cpython-27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169.tar.gz cpython-27bbcfb8ff55ed2c57042bf72eb2ba01ec7e4169.tar.bz2 | |
Merge #15543: glossary entry for and 'universal newlines', and links to it.
Patch by Chris Jerdonek.
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index aa184cf..df09c38 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -706,6 +706,13 @@ Glossary object has a type. An object's type is accessible as its :attr:`__class__` attribute or can be retrieved with ``type(obj)``. + universal newlines + A manner of interpreting text streams in which all of the following are + recognized as ending a line: the Unix end-of-line convention ``'\n'``, + the Windows convention ``'\r\n'``, and the old Macintosh convention + ``'\r'``. See :pep:`278` and :pep:`3116`, as well as + :func:`str.splitlines` for an additional use. + view The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and :meth:`dict.items` are called dictionary views. They are lazy sequences |