[Python-checkins] cpython (merge 3.5 -> default): Closes #25603: Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/1af59662f6d5
changeset:   99061:1af59662f6d5
parent:      99059:fd273cac682a
parent:      99060:81cc0cea2323
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Nov 11 23:00:01 2015 -0600
summary:
  Closes #25603: Merge with 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
@@ -478,7 +478,7 @@
 
    Usage::
 
-       Employee = typing.NamedTuple('Employee', [('name', str), 'id', int)])
+       Employee = typing.NamedTuple('Employee', [('name', str), ('id', int)])
 
    This is equivalent to::
 

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