mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.3 (#17132)

Browse source
This commit is contained in:
Benjamin Peterson 2013-02-05 10:12:31 -05:00
commit 0c2e193179
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/symbol.py
View file

@ -91,6 +91,7 @@ comp_for = 333
comp_if = 334 comp_if = 334
encoding_decl = 335 encoding_decl = 335
yield_expr = 336 yield_expr = 336
yield_arg = 337
#--end constants-- #--end constants--
sym_name = {} sym_name = {}
@ -104,7 +105,7 @@ def main():
import token import token
if len(sys.argv) == 1: if len(sys.argv) == 1:
sys.argv = sys.argv + ["Include/graminit.h", "Lib/symbol.py"] sys.argv = sys.argv + ["Include/graminit.h", "Lib/symbol.py"]
token.main() token._main()
if __name__ == "__main__": if __name__ == "__main__":
main() main()

2
Misc/NEWS
View file

@ -235,6 +235,8 @@ Core and Builtins
Library Library
------- -------
- Issue #17132: Update symbol for "yield from" grammar changes.
- Issue #17076: Make copying of xattrs more permissive of missing FS support. - Issue #17076: Make copying of xattrs more permissive of missing FS support.
Patch by Thomas Wouters. Patch by Thomas Wouters.