Merge branch 'master' into python-3.6-to-3.10

Author: rocky

.pre-commit-config.yaml

@@ -6,9 +6,9 @@ repos:
     hooks:
     - id: check-merge-conflict
     - id: debug-statements
-      stages: [commit]
+      stages: [pre-commit]
     - id: end-of-file-fixer
-      stages: [commit]
+      stages: [pre-commit]
 -   repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:

uncompyle6/scanner.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2016, 2018-2025 by Rocky Bernstein
+#  Copyright (c) 2016, 2018-2026 by Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <[email protected]>
 #  Copyright (c) 2000-2002 by hartmut Goebel <[email protected]>
 #  Copyright (c) 1999 John Aycock
@@ -37,7 +37,8 @@
     instruction_size,
     next_offset,
 )
-from xdis.version_info import IS_PYPY, version_tuple_to_str
+from xdis.op_imports import get_opcode_module
+from xdis.version_info import IS_PYPY, PythonImplementation, version_tuple_to_str
 
 from uncompyle6.scanners.tok import Token
 
@@ -111,25 +112,22 @@ def __init__(self, co, scanner, classname=None, show_asm=None):
 
 
 class Scanner(ABC):
-    def __init__(self, version: tuple, show_asm=None, is_pypy=False):
-        self.version = version
+    def __init__(self, version_tuple: tuple, show_asm=None, is_pypy=False):
+        self.version = version_tuple
         self.show_asm = show_asm
         self.is_pypy = is_pypy
 
         # Temporary initialization.
         self.opc = ModuleType("uninitialized")
 
-        if version[:2] in PYTHON_VERSIONS:
-            v_str = f"""opcode_{version_tuple_to_str(version, start=0, end=2, delimiter="")}"""
-            module_name = f"xdis.opcodes.{v_str}"
-            if is_pypy:
-                module_name += "pypy"
-            self.opc = importlib.import_module(module_name)
-        else:
-            raise TypeError(
-                "%s is not a Python version I know about"
-                % version_tuple_to_str(version)
+        if version_tuple[:2] in PYTHON_VERSIONS:
+            v_str = f"""opcode_{version_tuple_to_str(version_tuple, start=0, end=2, delimiter="")}"""
+            python_implementation = (
+                PythonImplementation.PyPy if is_pypy else PythonImplementation.CPython
             )
+            self.opc = get_opcode_module(version_tuple, python_implementation)
+        else:
+            raise TypeError("%s is not a Python version I know about" % v_str(version))
 
         self.opname = self.opc.opname
 
@@ -184,8 +182,10 @@ def bound_collection_from_tokens(self, tokens, t, i, collection_type):
         for j in range(collection_start, i):
             if tokens[j] == "LOAD_CONST":
                 opname = "ADD_VALUE"
+                op_type = "const"
             else:
                 opname = "ADD_VALUE_VAR"
+                op_type = "name"
             new_tokens.append(
                 Token(
                     opname=opname,
@@ -196,6 +196,7 @@ def bound_collection_from_tokens(self, tokens, t, i, collection_type):
                     linestart=tokens[j].linestart,
                     opc=self.opc,
                     has_extended_arg=False,
+                    optype=op_type,
                 )
             )
         new_tokens.append(
@@ -208,6 +209,7 @@ def bound_collection_from_tokens(self, tokens, t, i, collection_type):
                 linestart=t.linestart,
                 opc=t.opc,
                 has_extended_arg=False,
+                optype="vargs",
             )
         )
         return new_tokens

uncompyle6/scanners/scanner2.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2015-2024 by Rocky Bernstein
+#  Copyright (c) 2015-2025 by Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <[email protected]>
 #  Copyright (c) 2000-2002 by hartmut Goebel <[email protected]>
 #
@@ -39,7 +39,7 @@
 from sys import intern
 
 from xdis import code2num, instruction_size, iscode, op_has_argument
-from xdis.bytecode import _get_const_info
+from xdis.bytecode import _get_const_info, get_optype
 
 from uncompyle6.scanner import Scanner, Token
 
@@ -304,6 +304,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
 
             op = self.code[offset]
             op_name = self.op_name(op)
+            op_type = get_optype(op, self.opc)
 
             oparg = None
             pattr = None
@@ -470,7 +471,15 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
             if offset not in replace:
                 new_tokens.append(
                     Token(
-                        op_name, oparg, pattr, offset, linestart, op, has_arg, self.opc
+                        op_name,
+                        oparg,
+                        pattr,
+                        offset,
+                        linestart,
+                        op,
+                        has_arg,
+                        self.opc,
+                        optype=op_type,
                     )
                 )
             else:
@@ -484,6 +493,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
                         op,
                         has_arg,
                         self.opc,
+                        optype=op_type,
                     )
                 )
                 pass

uncompyle6/scanners/scanner3.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2015-2019, 2021-2024 by Rocky Bernstein
+#  Copyright (c) 2015-2019, 2021-2024, 2026 by Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <[email protected]>
 #  Copyright (c) 2000-2002 by hartmut Goebel <[email protected]>
 #
@@ -39,12 +39,12 @@
 from typing import Optional, Tuple
 
 import xdis
-
-# Get all the opcodes into globals
-import xdis.opcodes.opcode_33 as op3
 from xdis import Instruction, instruction_size, iscode
 from xdis.bytecode import _get_const_info
-from xdis.opcodes.opcode_3x import parse_fn_counts_30_35
+
+# Get all the opcodes into globals
+from xdis.opcodes import opcode_33 as op3
+from xdis.opcodes.opcode_3x.opcode_3x import parse_fn_counts_30_35
 
 from uncompyle6.scanner import CONST_COLLECTIONS, Scanner
 from uncompyle6.scanners.tok import Token

uncompyle6/scanners/scanner37base.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2015-2020, 2022-2024 by Rocky Bernstein
+#  Copyright (c) 2015-2020, 2022-2024, 2026 by Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <[email protected]>
 #  Copyright (c) 2000-2002 by hartmut Goebel <[email protected]>
 #
@@ -33,12 +33,12 @@
 from typing import Any, Dict, List, Set, Tuple
 
 import xdis
-
-# Get all the opcodes into globals
-import xdis.opcodes.opcode_37 as op3
 from xdis import Instruction, instruction_size, iscode
 from xdis.bytecode import _get_const_info
 
+# Get all the opcodes into globals
+from xdis.opcodes import opcode_37 as op3
+
 from uncompyle6.scanner import Scanner, Token
 
 globals().update(op3.opmap)

uncompyle6/semantics/n_actions.py

@@ -275,8 +275,8 @@ def n_const_list(self, node: SyntaxTree):
                 if elem == "ADD_VALUE":
                     if elem.optype in ("local", "name"):
                         value = elem.attr
-                    elif elem.optype == "const" and not isinstance(elem.attr, str):
-                        value = elem.attr
+                    elif elem.optype == "const":
+                        value = elem.pattr
                     else:
                         value = "%s" % repr(elem.attr)
                 else: