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

[berker.peksag]

https://hg.python.org/cpython/rev/ccbcc0e5ce53
changeset:   102568:ccbcc0e5ce53
parent:      102566:099fd7954941
parent:      102567:9f8666d2ff5d
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Aug 08 13:35:27 2016 +0300
summary:
  Merge from 3.5

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


diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -296,8 +296,8 @@
    s = a       # OK
 
    def foo(item: Any) -> int:
-       # Typechecks; `item` could be any type,
-       # and that type might have a `bar` method
+       # Typechecks; 'item' could be any type,
+       # and that type might have a 'bar' method
        item.bar()
        ...
 
@@ -333,7 +333,7 @@
 it as a return value) of a more specialized type is a type error. For example::
 
    def hash_a(item: object) -> int:
-       # Fails; an object does not have a `magic` method.
+       # Fails; an object does not have a 'magic' method.
        item.magic()
        ...
 

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