Fallout from more precise token attributes

pytest/test_grammar.py

@@ -66,7 +66,7 @@ def test_grammar():
     expect_dup_rhs = frozenset([('COME_FROM',), ('CONTINUE',), ('JUMP_ABSOLUTE',),
                                 ('LOAD_CONST',),
                                 ('JUMP_BACK',), ('JUMP_FORWARD',)])
-    reduced_dup_rhs = {k: dup_rhs[k] for k in dup_rhs if k not in expect_dup_rhs}
+    reduced_dup_rhs = dict((k, dup_rhs[k]) for k in dup_rhs if k not in expect_dup_rhs)
     for k in reduced_dup_rhs:
         print(k, reduced_dup_rhs[k])
     # assert not reduced_dup_rhs, reduced_dup_rhs

pytest/testdata/if-2.7.right

@@ -8,5 +8,5 @@
            9  STORE_NAME            2  'b'
           12  JUMP_FORWARD          0  'to 15'
         15_0  COME_FROM            12  '12'
-          15  LOAD_CONST            0  ''
+          15  LOAD_CONST            0  None
           18  RETURN_VALUE     

pytest/testdata/ifelse-2.7.right

@@ -11,5 +11,5 @@
    6      15  LOAD_CONST            1  2
           18  STORE_NAME            2  'd'
         21_0  COME_FROM            12  '12'
-          21  LOAD_CONST            2  ''
+          21  LOAD_CONST            2  None
           24  RETURN_VALUE