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

[sandro.tosi]

http://hg.python.org/cpython/rev/6f41f8ed87c8
changeset:   76529:6f41f8ed87c8
parent:      76526:e43ba06da592
parent:      76528:d1ba0421d65f
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Tue Apr 24 18:39:53 2012 +0200
summary:
  Issue #14554: merge with 3.2

files:
  Doc/library/test.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/test.rst b/Doc/library/test.rst
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -372,7 +372,7 @@
 
       with captured_stdout() as s:
           print("hello")
-      assert s.getvalue() == "hello"
+      assert s.getvalue() == "hello\n"
 
 
 .. function:: temp_cwd(name='tempcwd', quiet=False, path=None)

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