diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-02-05 10:12:31 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-02-05 10:12:31 -0500 |
commit | 0c2e193179e8d3b94e14f3d3fb5c69aba641364e (patch) | |
tree | c469fea97cb7f20570a216e56143184500995fe5 | |
parent | 4cd7b9c3e942b8afdbd41df16837fc09b5fb8993 (diff) | |
parent | 16d86aa69d34450f602e31d0068920eba66d4fe5 (diff) | |
download | cpython-git-0c2e193179e8d3b94e14f3d3fb5c69aba641364e.tar.gz |
merge 3.3 (#17132)
-rwxr-xr-x | Lib/symbol.py | 3 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/symbol.py b/Lib/symbol.py index 679e5c8cc7..34143b5d8e 100755 --- a/Lib/symbol.py +++ b/Lib/symbol.py @@ -91,6 +91,7 @@ comp_for = 333 comp_if = 334 encoding_decl = 335 yield_expr = 336 +yield_arg = 337 #--end constants-- sym_name = {} @@ -104,7 +105,7 @@ def main(): import token if len(sys.argv) == 1: sys.argv = sys.argv + ["Include/graminit.h", "Lib/symbol.py"] - token.main() + token._main() if __name__ == "__main__": main() @@ -235,6 +235,8 @@ Core and Builtins Library ------- +- Issue #17132: Update symbol for "yield from" grammar changes. + - Issue #17076: Make copying of xattrs more permissive of missing FS support. Patch by Thomas Wouters. |