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

[yury.selivanov]

https://hg.python.org/cpython/rev/c11bdccc4547
changeset:   99610:c11bdccc4547
parent:      99608:cca2ed4e8b41
parent:      99609:aa79b2a5b2e1
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Thu Dec 17 18:26:53 2015 -0500
summary:
  Merge 3.5

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


diff --git a/Doc/library/token.rst b/Doc/library/token.rst
--- a/Doc/library/token.rst
+++ b/Doc/library/token.rst
@@ -97,10 +97,16 @@
           RARROW
           ELLIPSIS
           OP
+          AWAIT
+          ASYNC
           ERRORTOKEN
           N_TOKENS
           NT_OFFSET
 
+   .. versionchanged:: 3.5
+      Added :data:`AWAIT` and :data:`ASYNC` tokens. Starting with
+      Python 3.7, "async" and "await" will be tokenized as :data:`NAME`
+      tokens, and :data:`AWAIT` and :data:`ASYNC` will be removed.
 
 .. seealso::
 

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