summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-08-12 10:35:31 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-08-12 10:35:31 (GMT)
commit5a5e8dd931b8a7e6fe3489270d6ba1a66530eab2 (patch)
tree0d0d524ccf4b13cc003d63dcd6261e263c193e0f /Doc/library
parent9e095aa6a4963fffe76ce2356d89e93ea845fa5c (diff)
parent82a509ca759dd420906ee074c0ca5973be137a30 (diff)
downloadcpython-5a5e8dd931b8a7e6fe3489270d6ba1a66530eab2.zip
cpython-5a5e8dd931b8a7e6fe3489270d6ba1a66530eab2.tar.gz
cpython-5a5e8dd931b8a7e6fe3489270d6ba1a66530eab2.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/stdtypes.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 6fd2339..4a3f883 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1358,7 +1358,7 @@ functions based on regular expressions.
For example, ``'ab c\n\nde fg\rkl\r\n'.splitlines()`` returns
``['ab c', '', 'de fg', 'kl']``, while the same call with ``splitlines(True)``
- returns ``['ab c\n', '\n, 'de fg\r', 'kl\r\n']``.
+ returns ``['ab c\n', '\n', 'de fg\r', 'kl\r\n']``.
Unlike :meth:`~str.split` when a delimiter string *sep* is given, this
method returns an empty list for the empty string, and a terminal line