Skip to content

Use ast.unparse for generating patches with lib_updater.py #6142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 12 commits into from
Sep 11, 2025
Merged

Use ast.unparse for generating patches with lib_updater.py #6142

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dd5661c
Use `ast.unparse` for decorator generation
ShaharNaveh Sep 9, 2025
e0b7984
Cleanup code a bit
ShaharNaveh Sep 9, 2025
25c5569
Use `ast.unparse` for every ut_method
ShaharNaveh Sep 9, 2025
30d1294
use textwrap
ShaharNaveh Sep 9, 2025
efdcfcc
Apply patches to `test_os.py`
ShaharNaveh Sep 9, 2025
4096e86
Apoly on `test_xml_etree.py`
ShaharNaveh Sep 9, 2025
9633595
Ensure ut_method type for external patches
ShaharNaveh Sep 9, 2025
bc8f77f
Run on some test files
ShaharNaveh Sep 9, 2025
aa50293
Mark failing test
ShaharNaveh Sep 9, 2025
aa95d8f
Update `test_str.py`
ShaharNaveh Sep 9, 2025
1966c3e
Update `test_logging.py` from 3.13.7
ShaharNaveh Sep 9, 2025
b4bf5ec
Merge remote-tracking branch 'upstream/main' into fix-lib-updater-bugs
ShaharNaveh Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use ast.unparse for decorator generation
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Sep 9, 2025
commit dd5661cdb28c3a12c6e02866bbb964191cd3ed5b
40 changes: 25 additions & 15 deletions scripts/lib_updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ class UtMethod(enum.StrEnum):
def _generate_next_value_(name, start, count, last_values) -> str:
return name[0].lower() + name[1:]

def has_args(self) -> bool:
return self != self.ExpectedFailure

def has_cond(self) -> bool:
return self.endswith(("If", "Unless"))

Expand Down Expand Up @@ -81,17 +84,23 @@ class PatchSpec(typing.NamedTuple):
cond: str | None = None
reason: str = ""

def fmt(self) -> str:
prefix = f"@unittest.{self.ut_method}"
match self.ut_method:
case UtMethod.ExpectedFailure:
line = f"{prefix} # {COMMENT}; {self.reason}"
case UtMethod.ExpectedFailureIfWindows | UtMethod.Skip:
line = f'{prefix}("{COMMENT}; {self.reason}")'
case UtMethod.SkipIf | UtMethod.SkipUnless | UtMethod.ExpectedFailureIf:
line = f'{prefix}({self.cond}, "{COMMENT}; {self.reason}")'
def as_decorator(self) -> str:
reason = f"{COMMENT}; {self.reason}".strip(" ;")
if not self.ut_method.has_args():
return f"@unittest.{self.ut_method} # {reason}"

args = []
if self.cond:
args.append(ast.parse(self.cond).body[0].value)
args.append(ast.Constant(value=reason))

return line.strip().rstrip(";").strip()
call_node = ast.Call(
func=ast.Attribute(value=ast.Name(id="unittest"), attr=self.ut_method),
args=args,
keywords=[],
)
unparsed = ast.unparse(call_node)
return f"@{unparsed}"


class PatchEntry(typing.NamedTuple):
Expand Down Expand Up @@ -170,9 +179,7 @@ def iter_patch_entires(
if ut_method.has_cond():
cond = ast.unparse(dec_node.args[0])

reason = (
reason.replace(COMMENT, "").strip().lstrip(";").lstrip(":").strip()
)
reason = reason.removeprefix(COMMENT).strip(";:, ")
spec = PatchSpec(ut_method, cond, reason)
yield cls(parent_class, fn_node.name, spec)

Expand Down Expand Up @@ -224,7 +231,10 @@ def iter_patch_lines(tree: ast.Module, patches: Patches) -> "Iterator[tuple[int,
default=fn_node.lineno,
)
indent = " " * fn_node.col_offset
yield (lineno - 1, "\n".join(f"{indent}{spec.fmt()}" for spec in specs))
yield (
lineno - 1,
"\n".join(f"{indent}{spec.as_decorator()}" for spec in specs),
)

# Phase 2: Iterate and mark inhereted tests
for cls_name, tests in patches.items():
Expand All @@ -233,7 +243,7 @@ def iter_patch_lines(tree: ast.Module, patches: Patches) -> "Iterator[tuple[int,
print(f"WARNING: {cls_name} does not exist in remote file", file=sys.stderr)
continue
for test_name, specs in tests.items():
patch_lines = "\n".join(f"{INDENT1}{spec.fmt()}" for spec in specs)
patch_lines = "\n".join(f"{INDENT1}{spec.as_decorator()}" for spec in specs)
yield (
lineno,
f"""
Expand Down