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

[berker.peksag]

https://hg.python.org/cpython/rev/ddeeb7d666eb
changeset:   104140:ddeeb7d666eb
parent:      104137:a0b13ea75849
parent:      104139:e6dcb14829cf
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed Sep 28 22:49:46 2016 +0300
summary:
  Issue #28306: Merge from 3.6

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