Can't handle python 2.3 on 3.x for now

rocky · rocky · commit bdd8a9f2a0f6 · 2016-06-03T10:55:13.000-04:00
diff --git a/test/Makefile b/test/Makefile
@@ -20,7 +20,7 @@ check:
 	$(MAKE) check-$$PYTHON_VERSION
 
 #: Run working tests from Python 2.6 or 2.7
-check-2.6 check-2.7: check-bytecode check-2.7-ok
+check-2.6 check-2.7: check-bytecode-2 check-bytecode-3  check-2.7-ok
 
 #: Run working tests from Python 3.2
 check-3.2: check-bytecode
@@ -41,14 +41,17 @@ check-3.4: check-bytecode check-3.4-ok check-2.7-ok
 check-disasm:
 	$(PYTHON) dis-compare.py
 
-#: Check deparsing bytecode only
+#: Check deparsing bytecode 2.x only
 check-bytecode-2:
-	$(PYTHON) test_pythonlib.py --bytecode-2.5 --bytecode-2.6 --bytecode-2.7
+	$(PYTHON) test_pythonlib.py --bytecode-2.3 --bytecode-2.5 --bytecode-2.6 --bytecode-2.7
+
+#: Check deparsing bytecode 3.x only
+check-bytecode-3:
+	$(PYTHON) test_pythonlib.py --bytecode-3.2 --bytecode-3.3 --bytecode-3.4 --bytecode-3.5
 
-#: Check deparsing bytecode only
-check-bytecode:
-	$(PYTHON) test_pythonlib.py --bytecode-2.3 --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 \
-        --bytecode-3.2 --bytecode-3.3 --bytecode-3.4 --bytecode-3.5
+#: Check deparsing bytecode that works running Python 2 and Python 3
+check-bytecode: check-bytecode-3
+	$(PYTHON) test_pythonlib.py --bytecode-2.5 --bytecode-2.6 --bytecode-2.7
 
 #: Check deparsing Python 2.3
 check-bytecode-2.3:
diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
@@ -22,7 +22,11 @@
 from uncompyle6.scanners.tok import Token
 
 # The byte code versions we support
-PYTHON_VERSIONS = (2.3, 2.4, 2.5, 2.6, 2.7, 3.2, 3.3, 3.4, 3.5)
+if PYTHON3:
+    # Need to work out Python 2.3. ord's in PYTHON3
+    PYTHON_VERSIONS = (2.5, 2.6, 2.7, 3.2, 3.3, 3.4, 3.5)
+else:
+    PYTHON_VERSIONS = (2.3, 2.5, 2.6, 2.7, 3.2, 3.3, 3.4, 3.5)
 
 # FIXME: DRY
 if PYTHON3:
@@ -268,12 +272,18 @@ def restrict_to_parent(self, target, parent):
             target = parent['end']
         return target
 
-def get_scanner(version, show_asm=False):
+def get_scanner(version, show_asm=None):
     # Pick up appropriate scanner
     if version in PYTHON_VERSIONS:
         v_str = "%s" % (int(version * 10))
         exec("import uncompyle6.scanners.scanner%s as scan" % v_str)
-        exec("scanner = scan.Scanner%s(show_asm=show_asm)" % v_str)
+        if PYTHON3:
+            import importlib
+            scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
+            if False: print(scan)  # Avoid unused scan
+        else:
+            exec("import uncompyle6.scanners.scanner%s as scan" % v_str)
+        scanner = eval("scan.Scanner%s(show_asm=show_asm)" % v_str)
     else:
         raise RuntimeError("Unsupported Python version %s" % version)
     return scanner
diff --git a/uncompyle6/scanners/scanner23.py b/uncompyle6/scanners/scanner23.py
@@ -10,6 +10,7 @@
 """
 
 from uncompyle6.scanners.scanner2 import Scanner2
+from uncompyle6.scanner import L65536
 
 class Scanner23(Scanner2):
     def __init__(self, show_asm=None):
@@ -60,7 +61,7 @@ def disassemble(self, co, code_objects={}, show_asm=None):
                 extended_arg = 0
                 i += 2
                 if op == self.opc.EXTENDED_ARG:
-                    extended_arg = oparg * 65536L
+                    extended_arg = oparg * L65536
                 if op in self.opc.hasconst:
                     const = co.co_consts[oparg]
                     # We can't use inspect.iscode() because we may be
