Changeset 391 for python/trunk/Lib/symbol.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/symbol.py (modified) (5 diffs)

python/trunk/Lib/symbol.py

@@ -8 +8 @@
 #  the python source tree after building the interpreter and run:
 #
-#    python Lib/symbol.py
+#    ./python Lib/symbol.py
 
 #--start constants--
@@ -53 +53 @@
 try_stmt = 296
 with_stmt = 297
-with_var = 298
+with_item = 298
 except_clause = 299
 suite = 300
@@ -75 +75 @@
 atom = 318
 listmaker = 319
-testlist_gexp = 320
+testlist_comp = 320
 lambdef = 321
 trailer = 322
@@ -83 +83 @@
 exprlist = 326
 testlist = 327
-dictmaker = 328
+dictorsetmaker = 328
 classdef = 329
 arglist = 330
@@ -90 +90 @@
 list_for = 333
 list_if = 334
-gen_iter = 335
-gen_for = 336
-gen_if = 337
+comp_iter = 335
+comp_for = 336
+comp_if = 337
 testlist1 = 338
 encoding_decl = 339