Track chaning xdis api

Author: rocky

pyproject.toml

@@ -12,7 +12,7 @@ description = "Python cross-version byte-code library and disassembler"
 dependencies = [
     "click",
     "spark-parser >= 1.8.9, < 1.9.2",
-    "xdis >= 6.1.0, < 6.3",
+    "xdis >= 6.2",
 ]
 readme = "README.rst"
 

uncompyle6/code_fns.py

@@ -35,7 +35,8 @@
 from collections import deque
 
 from xdis import check_object_path, iscode, load_module
-from xdis.version_info import version_tuple_to_str
+from xdis.version_info import PythonImplementation, version_tuple_to_str
+
 from uncompyle6.scanner import get_scanner
 
 
@@ -70,8 +71,7 @@ def disco_loop(disasm, queue, real_out):
                 )
             else:
                 print(
-                    "\n# %s of %s"
-                    % (co.co_name, co.co_filename),
+                    "\n# %s of %s" % (co.co_name, co.co_filename),
                     file=real_out,
                 )
         tokens, customize = disasm(co)
@@ -107,14 +107,26 @@ def disassemble_file(filename, outstream=None):
     try to find the corresponding compiled object.
     """
     filename = check_object_path(filename)
-    (version, timestamp, magic_int, co, is_pypy, source_size, sip_hash) = load_module(
-        filename
-    )
-    if type(co) == list:
+    (
+        version,
+        timestamp,
+        magic_int,
+        co,
+        python_implementation,
+        source_size,
+        sip_hash,
+        _,
+    ) = load_module(filename)
+    if isinstance(co, list):
         for con in co:
             disco(version, con, outstream)
     else:
-        disco(version, co, outstream, is_pypy=is_pypy)
+        disco(
+            version,
+            co,
+            outstream,
+            is_pypy=python_implementation == PythonImplementation.PyPy,
+        )
 
 
 def _test():

uncompyle6/main.py

@@ -25,7 +25,12 @@
 
 from xdis import iscode
 from xdis.load import load_module
-from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE, version_tuple_to_str
+from xdis.version_info import (
+    IS_PYPY,
+    PYTHON_VERSION_TRIPLE,
+    PythonImplementation,
+    version_tuple_to_str,
+)
 
 from uncompyle6.code_fns import check_object_path
 from uncompyle6.parser import ParserError
@@ -113,7 +118,7 @@ def write(s):
         write(f"# -*- coding: {source_encoding} -*-")
     write(
         "# uncompyle6 version %s\n"
-        "# %sPython bytecode version base %s%s\n# Decompiled from: %sPython %s"
+        "# %sPython bytecode version base %s%s\n#   Decompiled from: %sPython %s"
         % (
             __version__,
             co_pypy_str,
@@ -216,9 +221,16 @@ def decompile_file(
 
     filename = check_object_path(filename)
     code_objects = {}
-    version, timestamp, magic_int, co, is_pypy, source_size, _ = load_module(
-        filename, code_objects
-    )
+    (
+        version,
+        timestamp,
+        magic_int,
+        co,
+        python_implementation,
+        source_size,
+        _,
+        _,
+    ) = load_module(filename, code_objects)
 
     if isinstance(co, list):
         deparsed = []
@@ -234,7 +246,7 @@ def decompile_file(
                     showgrammar,
                     source_encoding,
                     code_objects=code_objects,
-                    is_pypy=is_pypy,
+                    is_pypy=python_implementation == PythonImplementation.PyPy,
                     magic_int=magic_int,
                     mapstream=mapstream,
                     start_offset=start_offset,
@@ -254,7 +266,7 @@ def decompile_file(
                 source_encoding,
                 code_objects=code_objects,
                 source_size=source_size,
-                is_pypy=is_pypy,
+                is_pypy=python_implementation == PythonImplementation.PyPy,
                 magic_int=magic_int,
                 mapstream=mapstream,
                 do_fragments=do_fragments,