Go over python_implementation value

Author: rocky

xdis/cross_dis.py

@@ -44,9 +44,13 @@ def _try_compile(source: str, name: str) -> CodeType:
     return c
 
 
-def code_info(x, version_tuple: Tuple[int, ...], python_implementation: PythonImplementation) -> str:
+def code_info(
+    x, version_tuple: Tuple[int, ...], python_implementation: PythonImplementation
+) -> str:
     """Formatted details of methods, functions, or code."""
-    return format_code_info(get_code_object(x), version_tuple, python_implementation=python_implementation)
+    return format_code_info(
+        get_code_object(x), version_tuple, python_implementation=python_implementation
+    )
 
 
 def get_code_object(x):
@@ -259,7 +263,12 @@ def op_has_argument(opcode: int, opc) -> bool:
     """
     Return True if `opcode` instruction has an operand.
     """
-    return opcode in opc.hasarg if hasattr(opc, "hasarg") else opcode >= opc.HAVE_ARGUMENT
+    return (
+        opcode in opc.hasarg
+        if hasattr(opc, "hasarg")
+        and opc.python_implementation is PythonImplementation.RustPython
+        else opcode >= opc.HAVE_ARGUMENT
+    )
 
 
 def pretty_flags(flags, python_implementation=PYTHON_IMPLEMENTATION) -> str:
@@ -269,7 +278,10 @@ def pretty_flags(flags, python_implementation=PYTHON_IMPLEMENTATION) -> str:
     for i in range(32):
         flag = 1 << i
         if flags & flag:
-            if python_implementation == PythonImplementation.PyPy and flag in PYPY_COMPILER_FLAG_NAMES:
+            if (
+                python_implementation == PythonImplementation.PyPy
+                and flag in PYPY_COMPILER_FLAG_NAMES
+            ):
                 names.append(PYPY_COMPILER_FLAG_NAMES.get(flag, hex(flag)))
             else:
                 names.append(COMPILER_FLAG_NAMES.get(flag, hex(flag)))
@@ -320,7 +332,9 @@ def format_code_info(
         pass
 
     if version_tuple >= (1, 3):
-        lines.append("# Flags:             %s" % pretty_flags(co.co_flags, python_implementation))
+        lines.append(
+            "# Flags:             %s" % pretty_flags(co.co_flags, python_implementation)
+        )
 
     if version_tuple >= (1, 5):
         lines.append("# First Line:        %s" % co.co_firstlineno)
@@ -373,7 +387,9 @@ def format_exception_table(bytecode, version_tuple) -> str:
     for entry in bytecode.exception_entries:
         lasti = " lasti" if entry.lasti else ""
         end = entry.end - 2
-        lines.append(f"  {entry.start} to {end} -> {entry.target} [{entry.depth}]{lasti}")
+        lines.append(
+            f"  {entry.start} to {end} -> {entry.target} [{entry.depth}]{lasti}"
+        )
     return "\n".join(lines)
 
 
@@ -414,7 +430,11 @@ def unpack_opargs_bytecode(code, opc):
         offset += 1
         if op_has_argument(op, opc):
             arg = code2num(code, offset) | extended_arg
-            extended_arg = extended_arg_val(opc, arg) if hasattr(opc, "EXTENDED_ARG") and op == opc.EXTENDED_ARG else 0
+            extended_arg = (
+                extended_arg_val(opc, arg)
+                if hasattr(opc, "EXTENDED_ARG") and op == opc.EXTENDED_ARG
+                else 0
+            )
             offset += 2
         else:
             arg = None
@@ -474,7 +494,7 @@ def xstack_effect(opcode, opc, oparg: int = 0, jump=None):
         if opname == "BUILD_MAP" and version_tuple >= (3, 5):
             return 1 - (2 * oparg)
         if opname in ("UNPACK_SEQUENCE",):
-                return oparg - 1
+            return oparg - 1
         elif opname in ("UNPACK_EX"):
             return (oparg & 0xFF) + (oparg >> 8)
         elif opname == "BUILD_INTERPOLATION":

xdis/opcodes/opcode_10.py

@@ -1,4 +1,4 @@
-# (C) Copyright 2019-2023 by Rocky Bernstein
+# (C) Copyright 2019-2023, 2025 by Rocky Bernstein
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -16,16 +16,16 @@
 """
 CPython 1.0 bytecode opcodes
 
-This is used in bytecode disassembly. This is similar to the
-opcodes in Python's dis.py library.
+This is like Python 1.0's dis.py with some classification
+of stack usage and information for formatting instructions.
 """
 
 import xdis.opcodes.opcode_11 as opcode_11
 
 # This is used from outside this module
 from xdis.cross_dis import findlabels  # noqa
 from xdis.opcodes.base import (  # Although these aren't used here, they are exported; noqa
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     name_op,
@@ -35,6 +35,7 @@
 from xdis.opcodes.opcode_11 import opcode_arg_fmt11, opcode_extended_fmt11
 
 version_tuple = (1, 0)
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_11, version_tuple)

xdis/opcodes/opcode_11.py

@@ -25,14 +25,15 @@
 # This is used from outside this module
 from xdis.cross_dis import findlabels
 from xdis.opcodes.base import (  # Although these aren't used here, they are exported; noqa
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     update_pj2,
 )
 from xdis.opcodes.opcode_12 import opcode_arg_fmt12, opcode_extended_fmt12
 
 version_tuple = (1, 1)  # 1.2 is the same
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_12, version_tuple)

xdis/opcodes/opcode_12.py

@@ -25,7 +25,7 @@
 # This is used from outside this module
 from xdis.cross_dis import findlabels  # noqa
 from xdis.opcodes.base import (  # Although these aren't used here, they are exported; noqa
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     name_op,
@@ -36,6 +36,7 @@
 from xdis.opcodes.opcode_13 import opcode_arg_fmt13, opcode_extended_fmt13
 
 version_tuple = (1, 2)
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_13, version_tuple)

xdis/opcodes/opcode_13.py

@@ -24,8 +24,8 @@
 
 # This is used from outside this module
 from xdis.cross_dis import findlabels  # noqa
-from xdis.opcodes.base import (  # Although these aren't used here, they are exported; noqa
-    cpython_implementation as python_implementation,
+from xdis.opcodes.base import (
+    cpython_implementation,
     def_op,
     finalize_opcodes,
     init_opdata,
@@ -35,6 +35,7 @@
 from xdis.opcodes.opcode_1x import opcode_extended_fmt_base1x, update_arg_fmt_base1x
 
 version_tuple = (1, 3)
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_14, version_tuple)

xdis/opcodes/opcode_14.py

@@ -25,6 +25,7 @@
 # This is used from outside this module
 from xdis.cross_dis import findlabels  # noqa
 from xdis.opcodes.base import (  # Although these aren't used here, they are exported
+    cpython_implementation,
     def_op,
     finalize_opcodes,
     init_opdata,
@@ -35,7 +36,7 @@
 from xdis.opcodes.opcode_1x import opcode_extended_fmt_base1x, update_arg_fmt_base1x
 
 version_tuple = (1, 4)
-python_implementation = "CPython"
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_15, version_tuple)

xdis/opcodes/opcode_15.py

@@ -16,21 +16,22 @@
 """
 CPython 1.5 bytecode opcodes
 
-This is a like Python 1.5's opcode.py with some classification
+This is a like Python 1.5's dis.py with some classification
 of stack usage and information for formatting instructions.
 of stack usage.
 """
 
 import xdis.opcodes.opcode_1x as opcode_1x
 from xdis.opcodes.base import (  # Although these aren't used here, they are exported; noqa
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     update_pj2,
 )
 from xdis.opcodes.opcode_1x import opcode_extended_fmt_base1x, update_arg_fmt_base1x
 
 version_tuple = (1, 5)
+python_implementation = cpython_implementation
 
 loc = locals()
 

xdis/opcodes/opcode_16.py

@@ -16,8 +16,9 @@
 """
 CPython 1.6 bytecode opcodes
 
-This is used in bytecode disassembly. This is similar to the
-opcodes in Python's dis.py library.
+This is a like Python 1.6's dis.py with some classification
+of stack usage and information for formatting instructions.
+of stack usage.
 """
 
 import xdis.opcodes.opcode_15 as opcode_15
@@ -26,14 +27,15 @@
 from xdis.cross_dis import findlabels, findlinestarts  # noqa
 from xdis.opcodes.base import (  # noqa
     call_op,
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     update_pj2,
 )
 from xdis.opcodes.opcode_2x import opcode_extended_fmt_base2x, update_arg_fmt_base2x
 
 version_tuple = (1, 6)
+python_implementation = cpython_implementation
 
 loc = locals()
 

xdis/opcodes/opcode_20.py

@@ -21,7 +21,7 @@
 
 import xdis.opcodes.opcode_21 as opcode_21
 from xdis.opcodes.base import (  # noqa
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     rm_op,
@@ -30,6 +30,7 @@
 from xdis.opcodes.opcode_2x import opcode_extended_fmt_base2x, update_arg_fmt_base2x
 
 version_tuple = (2, 0)
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_21, version_tuple)

xdis/opcodes/opcode_21.py

@@ -21,7 +21,7 @@
 
 import xdis.opcodes.opcode_22 as opcode_22
 from xdis.opcodes.base import (  # noqa
-    cpython_implementation as python_implementation,
+    cpython_implementation,
     finalize_opcodes,
     init_opdata,
     rm_op,
@@ -30,6 +30,7 @@
 from xdis.opcodes.opcode_2x import opcode_extended_fmt_base2x, update_arg_fmt_base2x
 
 version_tuple = (2, 1)
+python_implementation = cpython_implementation
 
 loc = locals()
 init_opdata(loc, opcode_22, version_tuple)