summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-08-15 14:43:58 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-08-15 14:43:58 (GMT)
commit1b00f25bf99d9b7a5f307984f6467258de636d23 (patch)
tree18d19d268ea3a642be447d3f7041211dc40f9379 /Doc/glossary.rst
parentf748a3773fd40dd91195fc2fef2cac2f973baaf8 (diff)
downloadcpython-1b00f25bf99d9b7a5f307984f6467258de636d23.zip
cpython-1b00f25bf99d9b7a5f307984f6467258de636d23.tar.gz
cpython-1b00f25bf99d9b7a5f307984f6467258de636d23.tar.bz2
#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.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index bf1234d..7cd9905 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -600,6 +600,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