feat: enhance PyExpr initialization with optional parameters and improve GenericUnpickler logic

Author: cnfatal

src/renpy/ast.py

@@ -206,17 +206,21 @@ class PyExpr(str):
         "filename",
         "linenumber",
         "py",
+        "hashcode",
+        "column",
     ]
 
-    def __new__(cls, s, filename, linenumber, py=3):
+    def __new__(cls, s, filename=None, linenumber=0, py=3, hashcode=None, column=0):
         self = str.__new__(cls, s)
         self.filename = filename  # type: ignore
         self.linenumber = linenumber  # type: ignore
         self.py = py  # type: ignore
+        self.hashcode = hashcode  # type: ignore
+        self.column = column  # type: ignore
         return self
 
     def __getnewargs__(self):
-        return (str(self), self.filename, self.linenumber, self.py)
+        return (str(self), self.filename, self.linenumber, self.py, self.hashcode, self.column)
 
     def get_code(self, **kwargs) -> str:
         return str(self)

src/renpy/astsupport.py

@@ -10,10 +10,10 @@ class PyExpr(str):
     def __new__(
         cls,
         expr: str,
-        filename: str,
-        linenumber: int,
-        py: int,
-        hashcode: str,
+        filename: str = '',
+        linenumber: int = 0,
+        py: int = 3,
+        hashcode: str = '',
         column: int = 0,
     ):
         self = super().__new__(cls, expr)

src/rpycdec/stmts.py

@@ -49,7 +49,7 @@ def __setstate__(self, state):
 
 class GenericUnpickler(pickle.Unpickler):
     def find_class(self, module, name):
-        if module.startswith("store") or module.startswith("renpy"):
+        if module.startswith("store"):
             return type(name, (DummyClass,), {"__module__": module})
         return super().find_class(module, name)
 
@@ -95,10 +95,12 @@ def load(data: io.BufferedReader, slots: list[int] = [1, 2], **kwargs) -> Node |
                 logger.info("Disassembling rpyc file...")
                 pickletools.dis(bindata)
 
-            data, stmts = pickle.loads(
-                bindata, encoding="utf-8", errors="surrogateescape"
+            unpickler = GenericUnpickler(
+                io.BytesIO(bindata), encoding="utf-8", errors="surrogateescape"
             )
-            key = data.get("key", "unlocked")
+            data, stmts = unpickler.load()
+
+            key = data.get("key", "unlocked")  # type: ignore
             return stmts
     raise Exception("Unsupported file format or invalid file")