Start Python 3.0 decoding

Fix some Python 3.1 bugs

Makefile

@@ -33,7 +33,7 @@ check-2.7 check-3.3 check-3.4: pytest
 
 #: Tests for Python 3.2 and 3.5 - pytest doesn't work here
 # Or rather 3.5 doesn't work not on Travis
-check-3.1 check-3.2 check-3.5 check-3.6:
+check-3.0 check-3.1 check-3.2 check-3.5 check-3.6:
 	$(MAKE) -C test $@
 
 #:Tests for Python 2.6 (doesn't have pytest)

test/Makefile

@@ -22,6 +22,10 @@ check:
 #: Run working tests from Python 2.6 or 2.7
 check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1  check-2.7-ok
 
+#: Run working tests from Python 3.1
+check-3.0: check-bytecode
+	@echo Python 3.0 testing not done yet
+
 #: Run working tests from Python 3.1
 check-3.1: check-bytecode
 	$(PYTHON) test_pythonlib.py --bytecode-3.1 --weak-verify $(COMPILE)
@@ -101,6 +105,10 @@ check-bytecode-2.6:
 check-bytecode-2.7:
 	$(PYTHON) test_pythonlib.py --bytecode-2.7
 
+#: Check deparsing Python 3.0
+check-bytecode-3.0:
+	@echo testing not done yet
+
 #: Check deparsing Python 3.1
 check-bytecode-3.1:
 	$(PYTHON) test_pythonlib.py --bytecode-3.1

test/test_pyenvlib.py

@@ -31,7 +31,8 @@ TEST_VERSIONS=('2.3.7', '2.4.6', '2.5.6', '2.6.9',
                'pypy-2.4.0', 'pypy-2.6.1',
                'pypy-5.0.1', 'pypy-5.3.1',
                '2.7.10', '2.7.11', '2.7.12',
-               '3.1.5', '3.2.6', '3.3.5', '3.3.6',
+               '3.0.1', '3.1.5', '3.2.6',
+               '3.3.5', '3.3.6',
                '3.4.2', '3.5.1')
 
 target_base = '/tmp/py-dis/'

uncompyle6/bin/uncompile.py

@@ -64,7 +64,9 @@ def usage():
 
 
 def main_bin():
-    if not (sys.version_info[0:2] in ((2, 6), (2, 7), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6))):
+    if not (sys.version_info[0:2] in ((2, 6), (2, 7),
+                                      (3, 2), (3, 3),
+                                      (3, 4), (3, 5), (3, 6))):
         print('Error: %s requires Python 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, or 3.6' % program,
               file=sys.stderr)
         sys.exit(-1)

uncompyle6/parser.py

@@ -621,7 +621,12 @@ def get_python_parser(
         pass
     else:
         import uncompyle6.parsers.parse3 as parse3
-        if version == 3.1:
+        if version == 3.0:
+            if compile_mode == 'exec':
+                p = parse3.Python30Parser(debug_parser)
+            else:
+                p = parse3.Python30ParserSingle(debug_parser)
+        elif version == 3.1:
             if compile_mode == 'exec':
                 p = parse3.Python31Parser(debug_parser)
             else:

uncompyle6/parsers/parse3.py

@@ -577,7 +577,7 @@ class Python3Parser(PythonParser):
                     self.add_unique_rule(rule, opname, token.attr, customize)
                     rule = "mapexpr ::=  %s %s" % (opname, kvlist_n)
                 self.add_unique_rule(rule, opname, token.attr, customize)
-            elif opname_base in ('UNPACK_EX'):
+            elif opname_base in ('UNPACK_EX',):
                 before_count, after_count = token.attr
                 rule = 'unpack ::= ' + opname + ' designator' * (before_count + after_count + 1)
                 self.add_unique_rule(rule, opname, token.attr, customize)
@@ -672,6 +672,15 @@ class Python3Parser(PythonParser):
         return
 
 
+class Python30Parser(Python3Parser):
+
+    def p_30(self, args):
+        """
+        # Store locals is only in Python 3.0 to 3.3
+        stmt ::= store_locals
+        store_locals ::= LOAD_FAST STORE_LOCALS
+        """
+
 class Python31Parser(Python3Parser):
 
     def p_31(self, args):
@@ -706,6 +715,9 @@ class Python3ParserSingle(Python3Parser, PythonParserSingle):
     pass
 
 
+class Python30ParserSingle(Python30Parser, PythonParserSingle):
+    pass
+
 class Python31ParserSingle(Python31Parser, PythonParserSingle):
     pass
 
@@ -728,6 +740,8 @@ def info(args):
             p = Python33Parser()
         elif arg == '3.2':
             p = Python32Parser()
+        elif arg == '3.0':
+            p = Python30Parser()
     p.checkGrammar()
     if len(sys.argv) > 1 and sys.argv[1] == 'dump':
         print('-' * 50)

uncompyle6/scanner.py

@@ -20,7 +20,7 @@ from uncompyle6.scanners.tok import Token
 # The byte code versions we support
 PYTHON_VERSIONS = (1.5,
                    2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7,
-                   3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
+                   3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
 
 # FIXME: DRY
 if PYTHON3:

uncompyle6/scanners/scanner3.py

@@ -249,7 +249,7 @@ class Scanner3(Scanner):
                     opname = '%s_N%d' % (opname, name_pair_args)
                     pass
                 if annotate_args > 0:
-                    opname = '%s_A_%d' % [opname, annotate_args]
+                    opname = '%s_A_%d' % (opname, annotate_args)
                     pass
                 opname = '%s_%d' % (opname, pos_args)
                 pattr = ("%d positional, %d keyword pair, %d annotated" %
@@ -286,6 +286,7 @@ class Scanner3(Scanner):
                 pattr = "%d before vararg, %d after" % (before_args, after_args)
                 argval = (before_args, after_args)
                 opname = '%s_%d+%d' % (opname, before_args, after_args)
+
             elif op == self.opc.JUMP_ABSOLUTE:
                 # Further classify JUMP_ABSOLUTE into backward jumps
                 # which are used in loops, and "CONTINUE" jumps which