From: Georg Brandl <georg@python.org>
Date: Sun, 17 May 2009 08:14:39 +0000 (+0000)
Subject: #4144: fix output of console sessions.
X-Git-Tag: v3.1rc1~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=397ad860e9b2c909a9cef6d5a0d55e0211353b37;p=thirdparty%2FPython%2Fcpython.git

#4144: fix output of console sessions.
---

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index e78947cb684f..41247ab47b24 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -53,7 +53,7 @@ programs, however, and result in error messages as shown here::
    >>> '2' + 2
    Traceback (most recent call last):
      File "<stdin>", line 1, in ?
-   TypeError: coercing to Unicode: need string or buffer, int found
+   TypeError: Can't convert 'int' object to str implicitly
 
 The last line of the error message indicates what happened. Exceptions come in
 different types, and the type is printed as part of the message: the types in
@@ -353,7 +353,7 @@ complicated example::
    ...         print("executing finally clause")
    ...
    >>> divide(2, 1)
-   result is 2
+   result is 2.0
    executing finally clause
    >>> divide(2, 0)
    division by zero!