Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-08-23 18:29:02 -04:00
parent 763826aec1 004e87048a
commit 8d2d8894da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/glossary.rst
View File

@ -849,7 +849,7 @@ Glossary
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.
:func:`bytes.splitlines` for an additional use.
view
The objects returned from :meth:`dict.keys`, :meth:`dict.values`, and