[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#17132)

[benjamin.peterson]

http://hg.python.org/cpython/rev/0fcd975765a7
changeset:   82017:0fcd975765a7
parent:      82014:7ccdbd1cd213
parent:      82016:23850c3899e8
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Feb 05 10:12:31 2013 -0500
summary:
  merge 3.3 (#17132)

files:
  Lib/symbol.py |  3 ++-
  Misc/NEWS     |  2 ++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/symbol.py b/Lib/symbol.py
--- a/Lib/symbol.py
+++ b/Lib/symbol.py
@@ -91,6 +91,7 @@
 comp_if = 334
 encoding_decl = 335
 yield_expr = 336
+yield_arg = 337
 #--end constants--
 
 sym_name = {}
@@ -104,7 +105,7 @@
     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()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -235,6 +235,8 @@
 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.
 

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