Merge branch 'master' into python-2.4

__pkginfo__.py

@@ -57,7 +57,8 @@ entry_points       = {
     ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.8.5, < 1.9.0',
-                      'xdis >= 3.8.2, < 3.9.0']
+                      'xdis >= 3.8.4, < 3.9.0']
+
 license            = 'GPL3'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'

admin-tools/check-newer-versions.sh

@@ -16,6 +16,7 @@ if ! source ./setup-master.sh ; then
 fi
 cd ..
 for version in $PYVERSIONS; do
+    echo --- $version ---
     if ! pyenv local $version ; then
 	exit $?
     fi
@@ -23,4 +24,5 @@ for version in $PYVERSIONS; do
     if ! make check; then
 	exit $?
     fi
+    echo === $version ===
 done

admin-tools/check-older-versions.sh

@@ -15,6 +15,7 @@ fi
 
 cd ..
 for version in $PYVERSIONS; do
+    echo --- $version ---
     if ! pyenv local $version ; then
 	exit $?
     fi
@@ -22,4 +23,5 @@ for version in $PYVERSIONS; do
     if ! make check ; then
 	exit $?
     fi
+    echo === $version ===
 done

uncompyle6/parsers/parse30.py

@@ -33,6 +33,7 @@ class Python30Parser(Python31Parser):
 
         ifelsestmtl ::= testexpr c_stmts_opt jb_pop_top else_suitel
         iflaststmtl ::= testexpr c_stmts_opt jb_pop_top
+        iflaststmt  ::= testexpr c_stmts_opt JUMP_ABSOLUTE POP_TOP
 
         withasstmt    ::= expr setupwithas store suite_stmts_opt
                           POP_BLOCK LOAD_CONST COME_FROM_FINALLY
@@ -75,8 +76,10 @@ class Python30Parser(Python31Parser):
     def customize_grammar_rules(self, tokens, customize):
         super(Python30Parser, self).customize_grammar_rules(tokens, customize)
         self.remove_rules("""
-        iflaststmtl ::= testexpr c_stmts_opt JUMP_BACK COME_FROM_LOOP
-        ifelsestmtl ::= testexpr c_stmts_opt JUMP_BACK else_suitel
+        iflaststmtl        ::= testexpr c_stmts_opt JUMP_BACK COME_FROM_LOOP
+        ifelsestmtl        ::= testexpr c_stmts_opt JUMP_BACK else_suitel
+        iflaststmt         ::= testexpr c_stmts_opt JUMP_ABSOLUTE
+        _ifstmts_jump      ::= c_stmts_opt JUMP_FORWARD _come_froms
         jump_forward_else  ::= JUMP_FORWARD ELSE
         jump_absolute_else ::= JUMP_ABSOLUTE ELSE
         whilestmt          ::= SETUP_LOOP testexpr l_stmts_opt COME_FROM JUMP_BACK POP_BLOCK

uncompyle6/scanner.py

@@ -506,12 +506,15 @@ def get_scanner(version, is_pypy=False, show_asm=None):
     if version in PYTHON_VERSIONS:
         v_str = "%s" % (int(version * 10))
         if PYTHON3:
-            import importlib
-            if is_pypy:
-                scan = importlib.import_module("uncompyle6.scanners.pypy%s" % v_str)
+            if version == 3.0:
+                import uncompyle6.scanners.scanner30 as scan
             else:
-                scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
-            if False: print(scan)  # Avoid unused scan
+                import importlib
+                if is_pypy:
+                    scan = importlib.import_module("uncompyle6.scanners.pypy%s" % v_str)
+                else:
+                    scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
+                if False: print(scan)  # Avoid unused scan
         else:
             if is_pypy:
                 exec("import uncompyle6.scanners.pypy%s as scan" % v_str)

uncompyle6/scanners/scanner3.py

@@ -78,8 +78,10 @@ class Scanner3(Scanner):
 
         if self.version == 3.0:
             self.pop_jump_tf = frozenset([self.opc.JUMP_IF_FALSE, self.opc.JUMP_IF_TRUE])
+            self.not_continue_follow = ('END_FINALLY', 'POP_BLOCK', 'POP_TOP')
         else:
             self.pop_jump_tf = frozenset([self.opc.PJIF, self.opc.PJIT])
+            self.not_continue_follow = ('END_FINALLY', 'POP_BLOCK')
 
         self.setup_ops_no_loop = frozenset(setup_ops) - frozenset([self.opc.SETUP_LOOP])
 
@@ -395,13 +397,9 @@ class Scanner3(Scanner):
                                   .opname == 'FOR_ITER'
                                   and self.insts[i+1].opname == 'JUMP_FORWARD')
 
-
                     if (is_continue or
-                        (inst.offset in self.stmts and
-                        (self.version != 3.0 or (hasattr(inst, 'linestart'))) and
-                        (next_opname not in ('END_FINALLY', 'POP_BLOCK',
-                                            # Python 3.0 only uses POP_TOP
-                                            'POP_TOP')))):
+                        (inst.offset in self.stmts and (inst.starts_line and
+                        next_opname not in self.not_continue_follow))):
                         opname = 'CONTINUE'
                     else:
                         opname = 'JUMP_BACK'