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

[sandro.tosi]

http://hg.python.org/cpython/rev/5a19909f5845
changeset:   75020:5a19909f5845
parent:      75018:5756b295b6fb
parent:      75019:9ce5d456138b
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat Feb 18 16:06:39 2012 +0100
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
@@ -2421,7 +2421,7 @@
       bytearray(b'zbcefg')
       >>> v[1:4] = b'123'
       >>> data
-      bytearray(b'a123fg')
+      bytearray(b'z123fg')
       >>> v[2] = b'spam'
       Traceback (most recent call last):
       File "<stdin>", line 1, in <module>

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