[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28306: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/e6dcb14829cf
changeset:   104139:e6dcb14829cf
branch:      3.6
parent:      104136:2ee939b314a2
parent:      104138:f60396d8f95c
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed Sep 28 22:49:27 2016 +0300
summary:
  Issue #28306: Merge from 3.5

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
@@ -201,7 +201,7 @@
    ... except ZeroDivisionError as err:
    ...     print('Handling run-time error:', err)
    ...
-   Handling run-time error: int division or modulo by zero
+   Handling run-time error: division by zero
 
 
 .. _tut-raising:

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