[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/520c0d391f00
changeset:   102490:520c0d391f00
parent:      102488:cd7520756215
parent:      102489:57066dbf3d94
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Jul 30 03:48:12 2016 +0300
summary:
  Merge from 3.5

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


diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -86,7 +86,7 @@
 ``UserId`` wherever an ``int`` might be expected, but will prevent you from
 accidentally creating a ``UserId`` in an invalid way::
 
-   # `output` is of type `int`, not `UserId`
+   # 'output' is of type 'int', not 'UserId'
    output = UserId(23413) + UserId(54341)
 
 Note that these checks are enforced only by the static type checker. At runtime

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