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

[georg.brandl]

http://hg.python.org/cpython/rev/56ddb9f6c51f
changeset:   85993:56ddb9f6c51f
parent:      85991:732abffd7433
parent:      85992:32689671a881
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 09:17:07 2013 +0200
summary:
  merge with 3.3

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


diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -45,7 +45,7 @@
    >>> 10 * (1/0)
    Traceback (most recent call last):
      File "<stdin>", line 1, in ?
-   ZeroDivisionError: int division or modulo by zero
+   ZeroDivisionError: division by zero
    >>> 4 + spam*3
    Traceback (most recent call last):
      File "<stdin>", line 1, in ?

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