[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/770020baf8e2
changeset:   78523:770020baf8e2
parent:      78520:508c9f9b701a
parent:      78522:7346821faf68
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sun Aug 12 12:35:31 2012 +0200
summary:
  merge with 3.2

files:
  Doc/library/stdtypes.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1358,7 +1358,7 @@
 
    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

-- 
Repository URL: http://hg.python.org/cpython