Closes #20956: 2.7 tokenize does not produce named tuples. Patch by Sam Kimbrel.

diff --git a/Doc/library/tokenize.rst b/Doc/library/tokenize.rst
index d0374521cd1a7b8ec721044f802a62c7f8415b6e..0fc0d7ef1b69926004edd61cabbb275602751408 100644 (file)
--- a/Doc/library/tokenize.rst
+++ b/Doc/library/tokenize.rst
@@ -17,9 +17,10 @@ for on-screen displays.
 
 To simplify token stream handling, all :ref:`operators` and :ref:`delimiters`
 tokens are returned using the generic :data:`token.OP` token type.  The exact
-type can be determined by checking the token ``string`` field on the
-:term:`named tuple` returned from :func:`tokenize.tokenize` for the character
-sequence that identifies a specific operator token.
+type can be determined by checking the second field (containing the actual
+token string matched) of the tuple returned from
+:func:`tokenize.generate_tokens` for the character sequence that identifies a
+specific operator token.
 
 The primary entry point is a :term:`generator`:
 

diff --git a/Misc/ACKS b/Misc/ACKS
index a6180020f9ee2485ace65e3e50ed28992e342211..581432028732b633386d60c16d375403c6432a23 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -670,6 +670,7 @@ Mads Kiilerich
 Jason Killen
 Jan Kim
 Taek Joo Kim
+Sam Kimbrel
 W. Trevor King
 Paul Kippes
 Steve Kirsch