diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-09-23 02:44:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-09-23 02:44:21 (GMT) |
| commit | 21df71ae8e9f7ed1a0f3de6923fa30961ac15888 (patch) | |
| tree | 76d58f042a520acf4b44bbd83bc38a06798a0c4e | |
| parent | 49a29571e98a8268ef7847a746b66831c3052e68 (diff) | |
| parent | eb83ffe1b3ffda0179b83244a4c25afe367c1b4d (diff) | |
| download | cpython-21df71ae8e9f7ed1a0f3de6923fa30961ac15888.zip cpython-21df71ae8e9f7ed1a0f3de6923fa30961ac15888.tar.gz cpython-21df71ae8e9f7ed1a0f3de6923fa30961ac15888.tar.bz2 | |
merge 3.4 (#22459)
| -rw-r--r-- | Doc/library/stdtypes.rst | 4 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 2dd57bc..8778212 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1830,7 +1830,7 @@ expression support in the :mod:`re` module). >>> '1,2,3'.split(',') ['1', '2', '3'] >>> '1,2,3'.split(',', maxsplit=1) - ['1', '2 3'] + ['1', '2,3'] >>> '1,2,,3,'.split(',') ['1', '2', '', '3', ''] @@ -2695,7 +2695,7 @@ produce new objects. >>> b'1,2,3'.split(b',') [b'1', b'2', b'3'] >>> b'1,2,3'.split(b',', maxsplit=1) - [b'1', b'2 3'] + [b'1', b'2,3'] >>> b'1,2,,3,'.split(b',') [b'1', b'2', b'', b'3', b''] @@ -298,6 +298,7 @@ Drew Csillag Joaquin Cuenca Abela John Cugini Tom Culliton +Raúl Cumplido Antonio Cuni Brian Curtin Lisandro Dalcin |