traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mostly-null-merge from 3.4 branch following 3.4.2 release.

This commit is contained in:
Larry Hastings 2014-10-08 02:56:18 -07:00
parent 32a7145764 2ce95d7b7c
commit c78319d9b8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -137,3 +137,4 @@ a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2
c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1
c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1
ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2

4
Doc/library/stdtypes.rst
View File

@ -1864,7 +1864,7 @@ expression support in the :mod:`re` module).
For example::
>>> 'ab c\n\nde fg\rkl\r\n'.splitlines()
['ab c', '', 'de fg', 'kl']``
['ab c', '', 'de fg', 'kl']
>>> 'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
['ab c\n', '\n', 'de fg\r', 'kl\r\n']
@ -2932,7 +2932,7 @@ place, and instead produce new objects.
For example::
>>> b'ab c\n\nde fg\rkl\r\n'.splitlines()
[b'ab c', b'', b'de fg', b'kl']``
[b'ab c', b'', b'de fg', b'kl']
>>> b'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
[b'ab c\n', b'\n', b'de fg\r', b'kl\r\n']