summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-12-17 23:26:53 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-12-17 23:26:53 (GMT)
commit7f955ab16a92ec4cb1494ca765cfbfb29df8b5f5 (patch)
tree739a3d7401a87868d5416e395d1cae65c737f8f1 /Doc/library
parent7f27d4382e89b59bd7bd5209ade332492b7ec235 (diff)
parent3dc74bf703d433a4060f6911ecfbc98be7ba267f (diff)
downloadcpython-7f955ab16a92ec4cb1494ca765cfbfb29df8b5f5.zip
cpython-7f955ab16a92ec4cb1494ca765cfbfb29df8b5f5.tar.gz
cpython-7f955ab16a92ec4cb1494ca765cfbfb29df8b5f5.tar.bz2
Merge 3.5
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/token.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/library/token.rst b/Doc/library/token.rst
index 88fb38b..c6bfa35 100644
--- a/Doc/library/token.rst
+++ b/Doc/library/token.rst
@@ -97,10 +97,16 @@ The token constants are:
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::