Merge branch 'master' into python-2.4

pytest/test_grammar.py

@@ -46,11 +46,9 @@ def test_grammar():
             unused_rhs.add("mkfunc_annotate")
             unused_rhs.add("dict_comp")
             unused_rhs.add("classdefdeco1")
-            if PYTHON_VERSION != 3.6:
-                if PYTHON_VERSION in (3.5, 3.7):
-                    expect_right_recursive.add((('l_stmts',
-                                                 ('lastl_stmt', 'come_froms', 'l_stmts'))))
-                    pass
+            if PYTHON_VERSION in (3.5, 3.6, 3.7):
+                expect_right_recursive.add((('l_stmts',
+                                             ('lastl_stmt', 'come_froms', 'l_stmts'))))
                 pass
             else:
                 expect_right_recursive.add((('l_stmts',

pytest/validate.py

@@ -11,6 +11,7 @@ from uncompyle6 import PYTHON_VERSION, IS_PYPY, deparse_code
 from xdis.bytecode import Bytecode
 from xdis.main import get_opcode
 opc = get_opcode(PYTHON_VERSION, IS_PYPY)
+from StringIO import StringIO
 
 try:
     import functools

uncompyle6/scanners/scanner2.py

@@ -43,6 +43,10 @@ from xdis.bytecode import (
     _get_const_info)
 from xdis.util import code2num
 
+from uncompyle6 import PYTHON3
+if PYTHON3:
+    from sys import intern
+
 from uncompyle6.scanner import Scanner, Token
 
 class Scanner2(Scanner):