diff options
| author | Larry Hastings <larry@hastings.org> | 2014-10-08 02:56:18 -0700 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-10-08 02:56:18 -0700 |
| commit | c78319d9b833ad936140bd993e215fb71977d372 (patch) | |
| tree | d4dc7b0505094669b4e386c158b7a2b9bf774f36 | |
| parent | 32a71457642ea2356c552b763dd0709b56a13380 (diff) | |
| parent | 2ce95d7b7c6252a720a7174ea837f88092ff35f1 (diff) | |
| download | cpython-git-c78319d9b833ad936140bd993e215fb71977d372.tar.gz | |
Mostly-null-merge from 3.4 branch following 3.4.2 release.
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -137,3 +137,4 @@ a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2 c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1 c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1 8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1 +ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2 diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 8778212cdb..6ab0ff64df 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -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'] |