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

[berker.peksag]

https://hg.python.org/cpython/rev/17fe6e23a8bc
changeset:   105368:17fe6e23a8bc
branch:      3.6
parent:      105365:43856eb83dc1
parent:      105367:18394c3c9640
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Fri Nov 25 20:10:30 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
@@ -754,7 +754,7 @@
    runtime we intentionally don't check anything (we want this
    to be as fast as possible).
 
-.. function:: get_type_hints(obj[, globals[, locals])
+.. function:: get_type_hints(obj[, globals[, locals]])
 
    Return a dictionary containing type hints for a function, method, module
    or class object.

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