Merge?

Author: rocky

xasm/assemble.py

@@ -71,6 +71,7 @@ def __init__(self, python_version, is_pypy) -> None:
         self.size = 0  # Size of source code. Only relevant in version 3 and above
         self.is_pypy = is_pypy
         self.python_version = python_version
+        self.is_pypy = is_pypy
         self.timestamp = None
         self.backpatch = []  # list of backpatch dicts, one for each function
         self.label = []  # list of label dists, one for each function
@@ -170,11 +171,11 @@ def asm_file(path) -> Optional[Assembler]:
                 # FIXME: extract all code options below the top-level and asm.code_list
 
         elif line.startswith("#"):
-            match = re.match("^# (Pypy )?Python bytecode ", line)
+            match = re.match("^# (PyPy )?Python bytecode ", line)
             if match:
                 if match.group(1):
+                    is_pypy = True
                     pypy_str = match.group(1)
-                    is_pypy = len(pypy_str)
                 else:
                     is_pypy = False
                     pypy_str = ""
@@ -197,7 +198,7 @@ def asm_file(path) -> Optional[Assembler]:
             elif line.startswith("# Timestamp in code: "):
                 text = line[len("# Timestamp in code: ") :].strip()
                 time_str = text.split()[0]
-                if is_int(time_str):
+                if is_int(time_str) and hasattr(asm, "timestamp"):
                     asm.timestamp = int(time_str)
             elif line.startswith("# Method Name: "):
                 if method_name:
@@ -248,7 +249,9 @@ def asm_file(path) -> Optional[Assembler]:
             elif line.startswith("# Number of locals: "):
                 l_str = line[len("# Number of locals: ") :].strip()
                 asm.code.co_nlocals = int(l_str)
-            elif line.startswith("# Source code size mod 2**32: "):
+            elif line.startswith("# Source code size mod 2**32: ") and hasattr(
+                asm, "size"
+            ):
                 l_str = line[
                     len("# Source code size mod 2**32: ") : -len(" bytes")
                 ].strip()

xasm/write_pyc.py

@@ -18,6 +18,8 @@ def write_pycfile(
 ) -> int:
     rc = 0
     version_str = version_tuple_to_str(version_triple, end=2)
+    if is_pypy:
+        version_str += "pypy"
     magic_bytes = magics[version_str]
     magic_int = magic2int(magic_bytes)
     fp.write(magic_bytes)