[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4
terry.reedy
python-checkins at python.org
Sun Aug 24 00:30:02 CEST 2014
http://hg.python.org/cpython/rev/8dea55fb20e9
changeset: 92212:8dea55fb20e9
parent: 92210:70c1a26c81a5
parent: 92211:3ad59ed0f4f0
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Aug 23 18:29:02 2014 -0400
summary:
Merge with 3.4
files:
Doc/glossary.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -849,7 +849,7 @@
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list