xasm 1.2.1__py310-none-any.whl → 1.2.1.dev0__py310-none-any.whl

xasm/assemble.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import ast
 import re
-from typing import Any, List, Optional
+from typing import Optional
 
 import xdis
 from xdis import get_opcode, load_module
@@ -21,7 +21,7 @@ class Instruction:  # (Mbytecode.Instruction):
             s = "%4d: " % self.line_no
         else:
             s = " " * 6
-        s += f"{self.opname:15}"
+        s += "%-15s" % self.opname
         if self.arg is not None:
             s += f"\t{self.arg}"
         return s
@@ -29,7 +29,7 @@ class Instruction:  # (Mbytecode.Instruction):
     pass
 
 
-def is_int(s: Any) -> bool:
+def is_int(s) -> bool:
     try:
         int(s)
         return True
@@ -41,7 +41,7 @@ def match_lineno(s: str):
     return re.match(r"^\d+:", s)
 
 
-def get_opname_operand(opc, fields: List[str]):
+def get_opname_operand(opc, fields):
     assert len(fields) > 0
     opname = fields[0]
     if opc.opmap[opname] < opc.HAVE_ARGUMENT:
@@ -63,7 +63,7 @@ def get_opname_operand(opc, fields: List[str]):
 
 
 class Assembler:
-    def __init__(self, python_version, is_pypy) -> None:
+    def __init__(self, python_version, is_pypy):
         self.opc = get_opcode(python_version, is_pypy)
         self.code_list = []
         self.codes = []  # FIXME use a better name
@@ -76,7 +76,7 @@ class Assembler:
         self.code = None
         self.siphash = None
 
-    def code_init(self, python_version=None) -> None:
+    def code_init(self, python_version=None):
         if self.python_version is None and python_version:
             self.python_version = python_version
 
@@ -102,19 +102,19 @@ class Assembler:
 
         self.code.instructions = []
 
-    def update_lists(self, co, label, backpatch) -> None:
+    def update_lists(self, co, label, backpatch):
         self.code_list.append(co)
         self.codes.append(self.code)
         self.label.append(label)
         self.backpatch.append(backpatch)
 
-    def print_instructions(self) -> None:
+    def print_instructions(self):
         for inst in self.code.instructions:
             if inst.line_no:
                 print()
             print(inst)
 
-    def warn(self, mess: str) -> None:
+    def warn(self, mess: str):
         """
         Print an error message and record that we warned, unless we have already errored.
         """
@@ -122,7 +122,7 @@ class Assembler:
         if self.status != "errored":
             self.status = "warning"
 
-    def err(self, mess: str) -> None:
+    def err(self, mess: str):
         """
         Print an error message and record that we errored.
         """
@@ -130,7 +130,7 @@ class Assembler:
         self.status = "errored"
 
 
-def asm_file(path) -> Optional[Assembler]:
+def asm_file(path):
     offset = 0
     methods = {}
     method_name = None
@@ -413,7 +413,7 @@ def asm_file(path) -> Optional[Assembler]:
     return asm
 
 
-def member(fields, match_value) -> int:
+def member(fields, match_value):
     for i, v in enumerate(fields):
         if v == match_value and type(v) == type(match_value):
             return i
@@ -421,7 +421,7 @@ def member(fields, match_value) -> int:
     return -1
 
 
-def update_code_field(field_name: str, value, inst, opc) -> None:
+def update_code_field(field_name, value, inst, opc):
     field_values = getattr(opc, field_name)
     # Can't use "in" because True == 1 and False == 0
     # if value in l:
@@ -433,7 +433,7 @@ def update_code_field(field_name: str, value, inst, opc) -> None:
         field_values.append(value)
 
 
-def update_code_tuple_field(field_name: str, code, lines: List[str], i: int):
+def update_code_tuple_field(field_name, code, lines, i):
     count = 0
     while i < len(lines):
         line = lines[i]
@@ -454,12 +454,12 @@ def update_code_tuple_field(field_name: str, code, lines: List[str], i: int):
     return i
 
 
-def err(msg: str, inst, i: int):
+def err(msg, inst, i):
     msg += ". Instruction %d:\n%s" % (i, inst)
     raise RuntimeError(msg)
 
 
-def warn(mess: str) -> None:
+def warn(mess: str):
     """
     Print an error message and record that we warned.
     """
@@ -562,7 +562,7 @@ def is_code_ok(asm: Assembler) -> bool:
 
 def append_operand(
     bytecode: list, arg_value, extended_arg_shift, arg_max_value, extended_arg_op
-) -> None:
+):
     """
     Write instruction operand adding EXTENDED_ARG instructions
     when necessary.

xasm/pyc_convert.py

@@ -13,18 +13,13 @@ from xdis import disassemble_file, load_module, magic2int, write_bytecode_file
 from xdis.magics import magics
 from xdis.opcodes import opcode_27, opcode_33
 
-from xasm.assemble import (
-    Assembler,
-    Instruction,
-    asm_file,
-    create_code,
-    decode_lineno_tab_old,
-)
+from xasm.assemble import (Assembler, Instruction, asm_file, create_code,
+                           decode_lineno_tab_old)
 from xasm.version import __version__
 from xasm.write_pyc import write_pycfile
 
 
-def add_credit(asm, src_version, dest_version) -> None:
+def add_credit(asm, src_version, dest_version):
     stamp = "Converted from Python %s to %s by %s version %s" % (
         src_version,
         dest_version,
@@ -35,7 +30,7 @@ def add_credit(asm, src_version, dest_version) -> None:
     return
 
 
-def copy_magic_into_pyc(input_pyc, output_pyc, src_version, dest_version) -> None:
+def copy_magic_into_pyc(input_pyc, output_pyc, src_version, dest_version):
     """Bytecodes are the same except the magic number, so just change
     that"""
     (version, timestamp, magic_int, co, is_pypy, source_size) = load_module(input_pyc)
@@ -48,7 +43,7 @@ def copy_magic_into_pyc(input_pyc, output_pyc, src_version, dest_version) -> Non
     return
 
 
-def xlate26_27(inst) -> None:
+def xlate26_27(inst):
     """Between 2.6 and 2.7 opcode values changed
     Adjust for the differences by using the opcode name
     """
@@ -146,9 +141,7 @@ def transform_33_32(inst, new_inst, i, n, offset, instructions, new_asm):
     return 0
 
 
-def transform_asm(
-    asm: Assembler | None, conversion_type, src_version, dest_version
-) -> Assembler:
+def transform_asm(asm, conversion_type, src_version, dest_version):
     new_asm = Assembler(dest_version, is_pypy=False)
     for field in "code size".split():
         setattr(new_asm, field, copy(getattr(asm, field)))
@@ -166,9 +159,7 @@ def transform_asm(
         new_asm.backpatch.append(copy(asm.backpatch[j]))
         new_asm.label.append(copy(asm.label[j]))
         new_asm.codes.append(copy(code))
-        new_asm.code.co_lnotab = decode_lineno_tab_old(
-            code.co_lnotab, code.co_firstlineno
-        )
+        new_asm.code.co_lnotab = decode_lineno_tab_old(code.co_lnotab, code.co_firstlineno)
         instructions = asm.codes[j].instructions
         new_asm.code.instructions = []
         i, offset, n = 0, 0, len(instructions)
@@ -220,7 +211,7 @@ UPWARD_COMPATIBLE = tuple("20-21 21-22 23-24 24-23".split())
 @click.argument(
     "output_pyc", type=click.Path(writable=True), required=False, nargs=1, default=None
 )
-def main(conversion_type, input_pyc, output_pyc) -> None:
+def main(conversion_type, input_pyc, output_pyc):
     """Convert Python bytecode from one version to another.
 
     INPUT_PYC contains the input bytecode path name

xasm/version.py

@@ -5,4 +5,4 @@
 # space around "=" below.
 
 # fmt: off
-__version__="1.2.1"  # noqa
+__version__="1.2.1.dev0"  # noqa

xasm/xasm_cli.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 import os
 import sys
-from typing import List
 
 import click
 import xdis
@@ -14,7 +13,7 @@ from xasm.write_pyc import write_pycfile
 @click.command()
 @click.option("--pyc-file", default=None)
 @click.argument("asm-path", type=click.Path(exists=True, readable=True), required=True)
-def main(pyc_file: List[str], asm_path):
+def main(pyc_file, asm_path):
     """
     Create Python bytecode from a Python assembly file.
 

{xasm-1.2.1.dist-info → xasm-1.2.1.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xasm
-Version: 1.2.1
+Version: 1.2.1.dev0
 Summary: Python cross-version byte-code assembler
 Home-page: https://github.com/rocky/python-xasm/
 Author: Rocky Bernstein
@@ -41,7 +41,7 @@ Dynamic: summary
 xasm
 ====
 
-*NOTE: this is in beta.*
+*NOTE: this is in beta*
 
 A cross-version Python bytecode assembler
 
@@ -93,7 +93,7 @@ A GNU makefile is also provided so ``make install`` (possibly as root or
 sudo) will do the steps above.
 
 
-*If you are using Python before 3.11*, do not install using PyPI, but instead install using a file in the `GitHub Releases section <https://github.com/rocky/python-xasm/releases>`_. Older Python used to use `easy_install <https://python101.pythonlibrary.org/chapter29_pip.html#using-easy-install>`_. But this is no longer supported in PyPi or newer Python versions. And vice versa, *poetry* nor *pip*, (the newer ways) are not supported on older Pythons.
+*If you are using Python before 3.11*, do not install using PyPI, but instead install using a file in the [GitHub Releases section](https://github.com/rocky/python-xasm/releases). Older Python used to use `easy_install <https://python101.pythonlibrary.org/chapter29_pip.html#using-easy-install>`_. But this is no longer supported in PyPi or newer Python versions. And vice versa, *poetry* nor *pip*, (the newer ways) are not supported on older Pythons.
 
 If the Python version you are running xasm is between Python 3.6 through 3.11, use a tarball called xasm_36-*x.y.z*.tar.gz.
 

xasm-1.2.1.dev0.dist-info/RECORD

@@ -0,0 +1,13 @@
+xasm/__init__.py,sha256=gz94OZ_Jc1WozfOYH1pjQeg7IgB1L9wv5fyytJ2XgZU,174
+xasm/assemble.py,sha256=gczajReJGCeCRGv7jZLWBsICZjzvJviXdMAwsRMOUWI,26257
+xasm/pyc_convert.py,sha256=6XtMK0Q--KW1wQqSXGfKNSxyFAl5a--Q9jvRoALQRyk,9090
+xasm/version.py,sha256=Fnb8SlddvYMcMFqKBfEsy6fBYxfxlGXDxelFtq6CwfM,211
+xasm/write_pyc.py,sha256=ZoqjupN9rEjJ5o49SZcX9rbEhaImnqsJKkNzLnT9j4c,1455
+xasm/xasm_cli.py,sha256=aGSypYaU2zotX-VXcVuZkPP45GzsQrlxGh0PwANBLK0,1754
+xasm-1.2.1.dev0.dist-info/licenses/LICENSE.gpl2,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+xasm-1.2.1.dev0.dist-info/METADATA,sha256=5BP-ch-Ko0W87cTNrIY2JsVZwlvnJ7xfqC9ef3gHOJs,7431
+xasm-1.2.1.dev0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+xasm-1.2.1.dev0.dist-info/entry_points.txt,sha256=Ypclbf0sCcywW8uPxxHAQv2pUujiKHx5OfcAYbSks98,84
+xasm-1.2.1.dev0.dist-info/top_level.txt,sha256=24UNOItB5o_EJoJ9nqhPZEC5GiSaYtHll3F6mJXzOkA,5
+xasm-1.2.1.dev0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+xasm-1.2.1.dev0.dist-info/RECORD,,

xasm-1.2.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-xasm/__init__.py,sha256=gz94OZ_Jc1WozfOYH1pjQeg7IgB1L9wv5fyytJ2XgZU,174
-xasm/assemble.py,sha256=GIf2cfvHa8QFyq0w820-c__Wpj5DeOtKtgicg9XbEjU,26420
-xasm/pyc_convert.py,sha256=s2UixbgUQZFHv9nmtvOV7TYohLBev2lcet0GIE9g6GM,9177
-xasm/version.py,sha256=xEuuftKJb_Pe2D5lJpTv3HxDgx6Bd1-lH_6HBGWFguw,206
-xasm/write_pyc.py,sha256=ZoqjupN9rEjJ5o49SZcX9rbEhaImnqsJKkNzLnT9j4c,1455
-xasm/xasm_cli.py,sha256=4EYRZVejspzBvoNaXsWgGbN7qRU5p-MPrt05IYu1kGc,1789
-xasm-1.2.1.dist-info/licenses/LICENSE.gpl2,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-xasm-1.2.1.dist-info/METADATA,sha256=ttOzLNtFPOn_c015VJhuv-E9sNCXsYGiojLM23FAZ8k,7429
-xasm-1.2.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-xasm-1.2.1.dist-info/entry_points.txt,sha256=Ypclbf0sCcywW8uPxxHAQv2pUujiKHx5OfcAYbSks98,84
-xasm-1.2.1.dist-info/top_level.txt,sha256=24UNOItB5o_EJoJ9nqhPZEC5GiSaYtHll3F6mJXzOkA,5
-xasm-1.2.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-xasm-1.2.1.dist-info/RECORD,,