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

[sandro.tosi]

http://hg.python.org/cpython/rev/ea74ed5b9a2b
changeset:   75034:ea74ed5b9a2b
parent:      75032:a9f090728729
parent:      75033:c3e0a0c79696
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sun Feb 19 12:28:18 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
@@ -2424,7 +2424,7 @@
       bytearray(b'z123fg')
       >>> v[2] = b'spam'
       Traceback (most recent call last):
-      File "<stdin>", line 1, in <module>
+        File "<stdin>", line 1, in <module>
       ValueError: cannot modify size of memoryview object
 
    Notice how the size of the memoryview object cannot be changed.

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