]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
projects / thirdparty / Python / cpython.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d36558 3bab40d)
Merge remote-tracking branch 'origin/master' into ast-type-comments
authorGuido van Rossum <guido@python.org>
Fri, 25 Jan 2019 16:39:49 +0000 (08:39 -0800)
committerGuido van Rossum <guido@python.org>
Fri, 25 Jan 2019 16:48:44 +0000 (08:48 -0800)
commit7e7855242fd5188d6444ca977b6f3d7ebed09b0c
tree36130a222505621178d67ac54b4131167a525207tree | snapshot
parent5d365583ee3720aa5d83590faa6cbcb77f151baecommit | diff
parent3bab40db96efda2e127ef84e6501fda0cdc4f5b8commit | diff
Merge remote-tracking branch 'origin/master' into ast-type-comments

Grammar changes merged:
- PEP 572 (assignment expessions)
- GH-10370 (slightly more lenient r.h.s. for annotated assignments)
12 files changed:
Doc/library/token-list.inc diff1 | diff2 | blob | history
Grammar/Grammar diff1 | diff2 | blob | history
Grammar/Tokens diff1 | diff2 | blob | history
Include/Python-ast.h diff1 | diff2 | blob | history
Include/graminit.h diff1 | diff2 | blob | history
Include/token.h diff1 | diff2 | blob | history
Lib/token.py diff1 | diff2 | blob | history
Parser/Python.asdl diff1 | diff2 | blob | history
Parser/token.c diff1 | diff2 | blob | history
Python/Python-ast.c diff1 | diff2 | blob | history
Python/ast.c diff1 | diff2 | blob | history
Python/graminit.c diff1 | diff2 | blob | history
Mirror of https://github.com/python/cpython.git