[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#22459)

[benjamin.peterson]

https://hg.python.org/cpython/rev/6dcc96fa3970
changeset:   92532:6dcc96fa3970
parent:      92530:ad45c2707006
parent:      92531:8eb4eec8626c
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Sep 22 22:44:21 2014 -0400
summary:
  merge 3.4 (#22459)

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1830,7 +1830,7 @@
       >>> '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 @@
       >>> 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'']
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -298,6 +298,7 @@
 Joaquin Cuenca Abela
 John Cugini
 Tom Culliton
+Raúl Cumplido
 Antonio Cuni
 Brian Curtin
 Lisandro Dalcin

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