RustPython
diff --git a/‎.claude/commands/upgrade-pylib.md‎
Lines changed: 2 additions & 2 deletions b/‎.claude/commands/upgrade-pylib.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎scripts/update_lib/auto_mark.py‎
Lines changed: 26 additions & 1 deletion b/‎scripts/update_lib/auto_mark.py‎
Lines changed: 26 additions & 1 deletion
diff --git a/‎scripts/update_lib/copy_lib.py‎
Lines changed: 44 additions & 12 deletions b/‎scripts/update_lib/copy_lib.py‎
Lines changed: 44 additions & 12 deletions
@@ -14,8 +14,8 @@ If during the upgrade process you encounter any of the following issues with `sc
 
 **STOP the upgrade and report the issue first.** Describe:
 1. What you were trying to do
-  - Library name
-  - The full command executed (e.g. python scripts/update_lib quick cpython/Lib/$ARGUMENTS.py)
+    - Library name
+    - The full command executed (e.g. python scripts/update_lib quick cpython/Lib/$ARGUMENTS.py)
 2. What went wrong or what's missing
 3. Expected vs actual behavior
 
 
@@ -22,6 +22,12 @@
 from update_lib.path import test_name_from_path
 
 
+class TestRunError(Exception):
+    """Raised when test run fails entirely (e.g., import error, crash)."""
+
+    pass
+
+
 @dataclass
 class Test:
     name: str = ""
@@ -58,7 +64,8 @@ def run_test(test_name: str, skip_build: bool = False) -> TestResult:
 
     result = subprocess.run(
         cmd + ["-m", "test", "-v", "-u", "all", "--slowest", test_name],
-        capture_output=True,
+        stdout=subprocess.PIPE,  # Capture stdout for parsing
+        stderr=None,  # Let stderr pass through to terminal
         text=True,
     )
     return parse_results(result)
@@ -236,6 +243,9 @@ def _is_super_call_only(func_node: ast.FunctionDef | ast.AsyncFunctionDef) -> bo
         return False
     if not isinstance(call.func, ast.Attribute):
         return False
+    # Verify the method name matches
+    if call.func.attr != func_node.name:
+        return False
     super_call = call.func.value
     if not isinstance(super_call, ast.Call):
         return False
@@ -487,6 +497,14 @@ def auto_mark_file(
         print(f"Running test: {test_name}")
 
     results = run_test(test_name, skip_build=skip_build)
+
+    # Check if test run failed entirely (e.g., import error, crash)
+    if not results.tests_result:
+        raise TestRunError(
+            f"Test run failed for {test_name}. "
+            f"Output: {results.stdout[-500:] if results.stdout else '(no output)'}"
+        )
+
     contents = test_path.read_text(encoding="utf-8")
 
     all_failing_tests, unexpected_successes, error_messages = collect_test_changes(
@@ -577,6 +595,13 @@ def auto_mark_directory(
 
     results = run_test(test_name, skip_build=skip_build)
 
+    # Check if test run failed entirely (e.g., import error, crash)
+    if not results.tests_result:
+        raise TestRunError(
+            f"Test run failed for {test_name}. "
+            f"Output: {results.stdout[-500:] if results.stdout else '(no output)'}"
+        )
+
     total_added = 0
     total_removed = 0
     total_regressions = 0
 
@@ -16,21 +16,12 @@
 import sys
 
 
-def copy_lib(
+def _copy_single(
     src_path: pathlib.Path,
+    lib_path: pathlib.Path,
     verbose: bool = True,
 ) -> None:
-    """
-    Copy library file or directory from CPython.
-
-    Args:
-        src_path: Source path (e.g., cpython/Lib/dataclasses.py or cpython/Lib/json)
-        verbose: Print progress messages
-    """
-    from update_lib.path import parse_lib_path
-
-    lib_path = parse_lib_path(src_path)
-
+    """Copy a single file or directory."""
     # Remove existing file/directory
     if lib_path.exists():
         if lib_path.is_dir():
@@ -46,6 +37,7 @@ def copy_lib(
     if src_path.is_dir():
         if verbose:
             print(f"Copying directory: {src_path} -> {lib_path}")
+        lib_path.parent.mkdir(parents=True, exist_ok=True)
         shutil.copytree(src_path, lib_path)
     else:
         if verbose:
@@ -54,6 +46,46 @@ def copy_lib(
         shutil.copy2(src_path, lib_path)
 
 
+def copy_lib(
+    src_path: pathlib.Path,
+    verbose: bool = True,
+) -> None:
+    """
+    Copy library file or directory from CPython.
+
+    Also copies additional files if defined in DEPENDENCIES table.
+
+    Args:
+        src_path: Source path (e.g., cpython/Lib/dataclasses.py or cpython/Lib/json)
+        verbose: Print progress messages
+    """
+    from update_lib.deps import get_lib_paths
+    from update_lib.path import parse_lib_path
+
+    # Extract module name and cpython prefix from path
+    path_str = str(src_path).replace("\\", "/")
+    if "/Lib/" in path_str:
+        cpython_prefix, after_lib = path_str.split("/Lib/", 1)
+        # Get module name (first component, without .py)
+        name = after_lib.split("/")[0]
+        if name.endswith(".py"):
+            name = name[:-3]
+    else:
+        # Fallback: just copy the single file
+        lib_path = parse_lib_path(src_path)
+        _copy_single(src_path, lib_path, verbose)
+        return
+
+    # Get all paths to copy from DEPENDENCIES table
+    all_src_paths = get_lib_paths(name, cpython_prefix)
+
+    # Copy each file
+    for src in all_src_paths:
+        if src.exists():
+            lib_path = parse_lib_path(src)
+            _copy_single(src, lib_path, verbose)
+
+
 def main(argv: list[str] | None = None) -> int:
     parser = argparse.ArgumentParser(
         description=__doc__,